summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix current user removaluser-destroy-wo-groupsDmitriy Zaporozhets2015-05-281-1/+1
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Add CHANGELOG itemDmitriy Zaporozhets2015-05-281-0/+1
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* You can not remove user if he/she is an only owner of groupDmitriy Zaporozhets2015-05-289-33/+68
| | | | | | | To prevent loose of group data you need to transfer or remove group first before you can remove user Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-05-2718-47/+131
|\
| * Merge branch 'browse-milestone-issues' into 'master'Douwe Maan2015-05-2714-46/+116
| |\ | | | | | | | | | | | | | | | | | | | | | Fix milestone "Browse Issues" button. After refactoring around issue/merge requests filters, the button stopped working :( See merge request !699
| | * Fix spec.browse-milestone-issuesDouwe Maan2015-05-271-2/+2
| | |
| | * Add Browse Issues button to Dashboard and Group milestones.Douwe Maan2015-05-274-4/+10
| | |
| | * Fix milestone "Browse Issues" button.Douwe Maan2015-05-273-3/+4
| | |
| | * Set milestone on new issue when creating issue from index with milestone ↵Douwe Maan2015-05-277-37/+100
| | | | | | | | | | | | filter active.
| * | Merge branch 'fix-disabled-project-snippet-feature' into 'master'Douwe Maan2015-05-274-1/+15
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix project snippets button appearing when it is disabled There was a typo in 9bcd36396b9b that caused the project snippets option to be shown when it is disabled. Closes #1705 See merge request !720
| | * | Fix project snippets button appearing when it is disabledStan Hu2015-05-274-1/+15
| | | | | | | | | | | | | | | | Closes #1705
* | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2015-05-273-1/+7
|\ \ \ \ | |/ / /
| * | | Merge branch 'fix-safari-clone-url' into 'master'Douwe Maan2015-05-272-1/+5
| |\ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix clone URL losing selection after a single click in Safari and Chrome ### What does this MR do? This MR deactivates the mouseup event in the `git clone` URL to prevent the text from being deselected after a single click. ### Why was this MR needed? In Safari and Chrome 43.0.2357.65 (42.0.2311.152 worked fine), the URL would lose selection after a single click. To reproduce: 1. Go to https://gitlab.com/gitlab-org/gitlab-ce 2. Click on the URL in the repository (HTTP is selected by default). 3. Click on the SSH button. 4. Click on the URL again. The URL selection should be selected automatically, but it is deselected immediately. It appears that 92544df changed the selection event from `click` to `focusin` to make copy & paste work in X11. This Stack Overflow article discusses the deselection issue in detail: http://stackoverflow.com/questions/3380458/looking-for-a-better-workaround-to-chrome-select-on-focus-bug ### What are the relevant issue numbers? Closes https://github.com/gitlabhq/gitlabhq/issues/9326 See merge request !698
| | * | Fix clone URL losing selection after a single click in Safari and ChromeStan Hu2015-05-242-1/+5
| | | | | | | | | | | | | | | | Closes #9326
| * | | Merge branch 'support-file-attachments-milestones' into 'master'Douwe Maan2015-05-272-0/+2
| |\ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add file attachment support in Milestone description ### What does this MR do? This MR adds support for attaching files to Milestone descriptions. ### Why was this MR needed? Dropzone support should be in every Markdown area. It seems that this one was overlooked. ### What are the relevant issue numbers? Closes #1648 See merge request !712
| | * | Add file attachment support in Milestone descriptionStan Hu2015-05-252-0/+2
| | | | | | | | | | | | | | | | Closes #1648
* | | | Add missing CHANGELOG itemDmitriy Zaporozhets2015-05-271-0/+1
|/ / / | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | Merge branch 'profile-in-sidebar' into 'master'Dmitriy Zaporozhets2015-05-276-25/+58
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move user avatar and logout button to sidebar Related to https://dev.gitlab.org/gitlab/gitlabhq/issues/2272 Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !719
| * | | Move user avatar and logout button to sidebarprofile-in-sidebarDmitriy Zaporozhets2015-05-276-25/+58
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Merge branch 'nav-settings' into 'master'Dmitriy Zaporozhets2015-05-273-2/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clarify navigation labels for Project Settings and Group Settings. Addresses internal issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2337. See merge request !703
| * | | | Clarify navigation labels for Project Settings and Group Settings.nav-settingsDouwe Maan2015-05-253-2/+3
| | | | |
* | | | | Merge branch 'commit-graphs-by-email' into 'master'Dmitriy Zaporozhets2015-05-273-10/+19
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Group project contributions by both name and email. See https://twitter.com/Argorain/status/598751646143897600. We now group by both name and email, so that "Douwe Maan - douwe@gitlab.com", "Douwe Maan - me@douwe.me" and "Douwe M. - me@douwe.me" are all combined into one graph. Fixes internal issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2328. See merge request !700
| * | | | | Update specs.commit-graphs-by-emailDouwe Maan2015-05-251-3/+5
| | | | | |
| * | | | | Group project contributions by both name and email.Douwe Maan2015-05-252-7/+14
| | | | | |
* | | | | | Merge branch 'emailsonpush-prefix' into 'master'Dmitriy Zaporozhets2015-05-272-1/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prefix EmailsOnPush email subject with `[Git]`. Fixes internal issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2112. See merge request !701
| * | | | | | Prefix EmailsOnPush email subject with `[Git]`.emailsonpush-prefixDouwe Maan2015-05-252-1/+3
| |/ / / / /
* | | | | | Merge branch 'point-to-gitlab-com' into 'master'Dmitriy Zaporozhets2015-05-271-4/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Point people to the issue tracker on GitLab.com to prevent duplication. /cc @jeroenvanbaarsen See merge request !713
| * | | | | | Point people to the issue tracker on GitLab.com to prevent duplication.point-to-gitlab-comSytse Sijbrandij2015-05-261-4/+2
| | | | | | |
* | | | | | | Merge branch 'accepted-rejected-mrs' into 'master'Dmitriy Zaporozhets2015-05-2718-32/+56
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. ![Screen_Shot_2015-05-25_at_17.02.31](https://gitlab.com/gitlab-org/gitlab-ce/uploads/b0bf43aa1b5b9898a1c6b204dbcf669a/Screen_Shot_2015-05-25_at_17.02.31.png) ![Screen_Shot_2015-05-25_at_17.02.47](https://gitlab.com/gitlab-org/gitlab-ce/uploads/2ac05b1e1dba3b2d1692bd9242078f3a/Screen_Shot_2015-05-25_at_17.02.47.png) ![Screen_Shot_2015-05-25_at_17.03.03](https://gitlab.com/gitlab-org/gitlab-ce/uploads/4c0f0fa869c9130a6af18d80a1c6ebed/Screen_Shot_2015-05-25_at_17.03.03.png) Addresses internal issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2201. See merge request !702
| * | | | | | Update specs.accepted-rejected-mrsDouwe Maan2015-05-252-6/+6
| | | | | | |
| * | | | | | Add Accepted and Rejected tabs to MR lists.Douwe Maan2015-05-2510-13/+36
| | | | | | |
| * | | | | | Consistently refer to MRs as either Accepted or Rejected.Douwe Maan2015-05-257-12/+13
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'rs-to_reference' into 'master'Dmitriy Zaporozhets2015-05-2754-472/+866
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add to_reference method to referable models Now there is a single source of information for which attribute a model uses to be referenced, and its special character. See merge request !641
| * | | | | | More SystemNoteService cleanuprs-to_referenceRobert Speicher2015-05-263-46/+22
| | | | | | |
| * | | | | | Fix ClosingIssueExtractor specsRobert Speicher2015-05-261-5/+5
| | | | | | |
| * | | | | | Make use of to_reference in more specsRobert Speicher2015-05-2612-73/+76
| | | | | | |
| * | | | | | Add a note about the commented-out test in Markdown FeatureRobert Speicher2015-05-261-0/+4
| | | | | | |
| * | | | | | Surround Project.reference_pattern in parenthesis inside other patternsRobert Speicher2015-05-264-4/+7
| | | | | | |
| * | | | | | Make `cross_project_reference?` less magicalRobert Speicher2015-05-261-4/+3
| | | | | | |
| * | | | | | Support only double quotes for multi-word label referencesRobert Speicher2015-05-264-53/+33
| | | | | | |
| * | | | | | Fix for Snippets with a projectRobert Speicher2015-05-261-1/+1
| | | | | | |
| * | | | | | Minor documentation updatesRobert Speicher2015-05-262-2/+2
| | | | | | |
| * | | | | | Add `reference_pattern` to Referable modelsRobert Speicher2015-05-2620-74/+130
| | | | | | |
| * | | | | | Use `to_reference` in reference filter specsRobert Speicher2015-05-269-95/+86
| | | | | | |
| * | | | | | Add invalidate_reference to ReferenceFilterSpecHelperRobert Speicher2015-05-261-0/+19
| | | | | | |
| * | | | | | Update CommitRange#to_reference to use full SHAsRobert Speicher2015-05-263-18/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | We only want them shortened by the filter, which calls to_s
| * | | | | | Correct the ReferenceFilter html/pipeline/filter requireRobert Speicher2015-05-261-1/+1
| | | | | | |
| * | | | | | Implement gfm_reference directly in MentionableRobert Speicher2015-05-264-19/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Except for Note, which still overrides it.
| * | | | | | Simplify `cross_project_reference` with `to_reference`Robert Speicher2015-05-261-7/+17
| | | | | | |
| * | | | | | Use to_reference in Markdown feature specRobert Speicher2015-05-262-43/+38
| | | | | | |
View Lorry Controller Status