46503b789d
Fix invalid tests
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-30 15:29:52 +02:00
2be714dcf6
Show CI status on commit page
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-24 11:40:48 +02:00
eae27d1ecb
Move CI charts to project graphs area
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-09-23 16:24:46 +02:00
183892fde9
Merge branch 'notification-levels' into 'master'
...
Notification levels can now be set on the Project's main page
The notification settings for a project can now be set directly on the Project's page. The drop down list and the button label reflect the current level.
Saving is done via a remote form submission and if successful shows the user a flash message:
@DouweM can you please review my code. I gave my bestest effort to make in clean and readable.
@rspeicher hopefully we can include it with the 8.0 release, maybe?
/cc @darby
See merge request !1322
2015-09-21 09:19:32 +00:00
f481637245
Merge branch 'fix-issue-2382' into 'master'
...
Create a "destroyed Milestone" event and keep Milestone events around in the DB for posterity
Also fix issue where destroying a Milestone would cause odd, transient messages like "created milestone" or "imported milestone".
Now if a milestone is destroyed, at least it will indicate in the activity feed even if it's not clear which milestone was destroyed:
Closes #2382
See merge request !1227
2015-09-17 08:04:37 +00:00
1ddefa3bea
Merge branch 'master' into notification-levels
2015-09-16 19:54:18 -05:00
de1ffce739
Added Spinach tests and updated CHANGELOG
2015-09-16 18:03:48 -05:00
d9af6f79ed
Change the replace placeholder to use the filename
...
Dynamically adjust placedholder for uploads and fix Dropzone event handlers
Override error handler to prevent error messages from being inserted underneath image preview
Fix tests
Use regexp instead of startsWith for better browser compatibility
Remove duplicate code in _replace.html.haml and use one template
Remove files upon error and retain alert messages until user adds a new file
2015-09-15 13:07:32 -07:00
d3d03d1362
Create a "destroyed Milestone" event and keep Milestone events around in the DB
...
for posterity.
Also fix issue where destroying a Milestone would cause odd, transient messages like
"created milestone" or "imported milestone".
Add "in" preposition when creating and destroying milestones
Closes #2382
2015-09-15 05:51:11 -07:00
e2ece2bc35
Add "Replace" and "Upload" features
...
Refactor upload and replace functionality
Rename file and move CSS
Fix typo
Make dropzone a div
Remove unnecessary file
Change color of "upload existing one"
Add missing changes
2015-09-15 02:12:56 +02:00
fbb891c8f3
Fix broken Wiki Page History
...
Closes #2104
Closes #1751
Closes #1592
Closes https://github.com/gitlabhq/gitlabhq/issues/9399
2015-09-01 23:29:27 -07:00
ef0149dd44
Merge branch 'enable_ssl_verification_web_hook' into 'master'
...
Enable SSL verification for Webhooks
https://dev.gitlab.org/gitlab/gitlabhq/issues/2121
See merge request !1135
2015-08-26 16:06:02 +00:00
bafffb2d14
Enable SSL verification for Webhooks
2015-08-26 15:48:31 +03:00
3bee4a6712
Fix "Reload with full diff" URL button in compare branch view
...
This button worked when viewing merge requests because the JavaScript
stripped the .html in the Ajax request. However, it left the .html suffix
in the compare branch view.
2015-08-24 23:35:26 -07:00
369275d630
Fix network graph when branch name has single quotes
...
Closes https://github.com/gitlabhq/gitlabhq/issues/9500
2015-07-29 23:29:47 -07:00
562242cb9d
Fix commit data retrieval when branch name has single quotes
...
Closes #1724
2015-07-26 03:47:01 -07:00
df2bb60f90
Add support for destroying project milestones
...
Closes https://github.com/gitlabhq/gitlabhq/issues/1504
2015-07-17 06:54:32 -07:00
4dfded8934
Make left menu more hierarchical and less contextual by adding back item at top
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-07-10 13:29:46 +02:00
a0b9fe1288
Fix project tests
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-07-08 20:22:42 +02:00
0ebe8be02d
Fix schortcut tests
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-07-08 17:36:31 +02:00
39a4bb2abd
Cleanup and some test fixes after refactoring project home page
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-07-08 16:55:04 +02:00
8404ab46b9
Add shortcut for project activity page
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-07-08 12:43:46 +02:00
9cc00aa501
Fix "Project Forked Merge Requests" scenario
2015-06-26 22:41:02 -04:00
06ab7d89f9
Merge branch 'rs-issue-1887' into 'master'
...
Reorder MergeRequestTabs constructor
The tab was being activated before we set the `[commits|diffs]Loaded`
variable, so even when the `/diffs` route is accessed directly, like
from the "Side-by-side" link, the tab was being loaded from its default
source.
Fixes #1887
See merge request !892
2015-06-26 16:17:07 +00:00
e14d517b61
Fix merge request diff features
2015-06-25 21:30:18 -04:00
304386aa02
Write test for submitting issue as guest
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-25 16:38:14 +02:00
b902a9b83d
Merge branch 'split-tests' into 'master'
...
Split rspec and spinach tests in parallel
For https://dev.gitlab.org/gitlab/gitlabhq/issues/2386
See merge request !874
2015-06-23 15:17:11 +00:00
12e0998635
Refactor rake tasks for tests
2015-06-23 16:48:52 +02:00
555fd0cf4a
Fix downloading of patches on public merge requests when user logged out
...
Closes #1225
Closes #1854
Closes #1858
2015-06-23 05:34:21 -07:00
cc9b5c49d1
Merge branch 'revert-mr-state-names'
...
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Conflicts:
features/steps/project/merge_requests.rb
2015-06-22 15:43:09 +02:00
afec5efc7d
Fix features syntax
2015-06-22 12:13:45 +02:00
7524d7c082
Revert merge request states renaming
...
Replaced:
* "Accepted" with "Merged"
* "Rejected" with "Closed"
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-06-19 17:09:50 +02:00
1f88d9b56f
Remove "Multiselect Blob" feature specs
...
These are well covered by the new Jasmine tests, and faster!
2015-06-19 04:31:24 -04:00
a7932fe2fd
Support commenting on a diff in side-by-side view
...
Closes https://github.com/gitlabhq/gitlabhq/issues/9283
2015-06-16 06:11:59 -07:00
ebe4963871
Move Project Members link from Settings to main menu.
...
Addresses #2278 .
2015-06-09 14:45:38 +02:00
5e4384ec9b
Support editing target branch of merge request
...
Closes https://github.com/gitlabhq/gitlabhq/issues/7105
See: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/130
2015-05-29 04:08:08 -07:00
ab88b7da19
Fix project snippets button appearing when it is disabled
...
Closes #1705
2015-05-27 05:07:44 -07:00
9eec0d5436
Merge branch 'accepted-rejected-mrs' into 'master'
...
Add Accepted and Rejected tabs to MR lists.
Before, MRs were referred to as Merged or Closed, but the Merge button on the MR page read "Accept Merge Request", the activity feed even read "X accepted merge request Y", and the Closed tab on the MR index included both Merged _and_ Closed MRs. I've changed every occurrence to consistently refer to MRs as either Accepted or Rejected, which is less technical and more clearly two opposites.
Addresses internal issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2201 .
See merge request !702
2015-05-27 11:40:36 +00:00
b16aad9dd1
Validate wiki page creation
...
**What does this do?**
It adds validation to the creation of a wiki page, that way the user gets real
feedback instead of just a 404 page if the name of the wiki page was invalid
**Why is this needed?**
There are a lot of characters that are not allowed in the creation of a wiki
page, there is even a small text that is saying: Please don't use spaces.
Although we have that text there, we don't actually validate on this. This
commit adds validation on the title and gives the user actual feedback.
**What issues does this fix?**
Fixes http://github.com/gitlabhq/gitlabhq/issues/5357
Fixes https://github.com/gitlabhq/gitlabhq/issues/8565
Fixes https://github.com/gitlabhq/gitlabhq/issues/3913
Fixes https://github.com/gitlabhq/gitlabhq/issues/8166
Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
2015-05-26 19:01:11 +02:00
7df45882a9
Update specs.
2015-05-25 18:37:38 +02:00
a7d8a7bd3d
Disable "New Issue" and "New Merge Request" buttons when features are disabled in project settings
...
Closes #1676
2015-05-25 06:16:33 -04:00
7a7ce70169
Use the user list from the target project in a merge request
...
Closes #1535
2015-05-22 09:52:09 -04:00
a0fd2eb568
Don't show duplicate deploy keys. Fixes #1516
2015-05-08 21:32:03 +02:00
f3d63eeb18
Remove feature tests for old task lists
2015-05-06 13:00:14 -04:00
44afcd2019
Fix DB error when trying to tag a repository
...
Upon tagging a repository, an error due to a missing migration occurred:
```
PG::Error: ERROR: column "taggings_count" does not exist
LINE 1: UPDATE "tags" SET "taggings_count" = COALESCE("taggings_coun...
```
Ran `rake acts_as_taggable_on_engine:install:migrations`, removed the first
migration that created the `tags` and `taggings` table, and added the rest.
Closes #1512
Closes https://github.com/gitlabhq/gitlabhq/issues/6867
Closes https://github.com/gitlabhq/gitlabhq/issues/9194
2015-04-27 06:09:20 -07:00
9b330859bf
Change "Sam" to "Dmitriy" in feature steps
...
"Sam" was too short and generic and caused invalid test failures due to
finding other people with names like "Sammie" or "Samuel" unexpectedly.
2015-04-23 18:59:57 -04:00
8949af0c9f
Add feature tests for inviting members.
2015-04-14 12:08:11 +02:00
9c14ed0689
Merge branch 'public-deploy-keys' into 'master'
...
Allow admin to create public deploy keys that are accessible to any project.
Addresses private issue https://dev.gitlab.org/gitlab/gitlabhq/issues/1774 .
Project settings:
The "Public deploy keys" section is only shown when there are any. If there are public deploy keys but no project deploy keys, only public deploy keys are shown. If there are no public deploy keys and no project deploy keys, the current "Deploy keys from projects you have access to will be displayed here" placeholder is shown.
The list of projects below the public key has been changed to only show projects the user has access to.
"Public deploy key" seems to be repeated on the left, but the first is just the title. The label is always visible for public deploy keys.
Admin index:
Admin detail page:
Projects using the deploy key are listed on the left and can be disabled easily.
See merge request !469
2015-04-13 09:08:13 +00:00
3d2c387840
Move current user to the top of the list in author/assignee filters
...
Closes #1321
2015-04-09 01:04:53 -07:00
3143edfea6
Fix bug where Wiki pages that include a '/' were no longer accessible
...
Closes #1363
2015-04-07 09:10:11 -07:00
Dmitriy Zaporozhets
Douwe Maan
Stan Hu
Patricio Cano
liyakun
Valery Sizov
Robert Speicher
Nicolas
Jeroen van Baarsen
Maran
