summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Replace some icons in headerheader-iconsDmitriy Zaporozhets2015-05-271-2/+2
| | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* 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
| | | | |
| * | | | Use to_reference in Mentionable shared examplesRobert Speicher2015-05-261-18/+14
| | | | |
| * | | | Minor model spec cleanupsRobert Speicher2015-05-265-27/+17
| | | | | | | | | | | | | | | | | | | | Snippet model was missing project association
| * | | | Add `to_reference` for models that support referencesRobert Speicher2015-05-2620-52/+377
| | | | | | | | | | | | | | | | | | | | | | | | | Now there is a single source of information for which attribute a model uses to be referenced, and its special character.
| * | | | Add Referable concernRobert Speicher2015-05-261-0/+52
| | | | |
| * | | | Add Commit#==Robert Speicher2015-05-261-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prior, comparison would use the Ruby object's ID, which got out of sync after a Spring fork and would result in erroneous test failures. Now we just check that the compared object is a Commit and then compare their underlying raw commit objects.
* | | | | Merge branch 'rs-manual-2fa-entry' into 'master'Dmitriy Zaporozhets2015-05-275-6/+40
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for manually entering 2FA details > ![Screen_Shot_2015-05-22_at_6.39.26_PM](https://gitlab.com/gitlab-org/gitlab-ce/uploads/27b6cc0b2f88e0ccec234dd8d20db957/Screen_Shot_2015-05-22_at_6.39.26_PM.png) Related to #1679 though I'm not sure if it entirely fixes it, since I don't have access to a Windows Phone. See merge request !694
| * | | | | Bump secret key length to 32rs-manual-2fa-entryRobert Speicher2015-05-233-3/+3
| | | | | |
| * | | | | Add support for manually entering 2FA detailsRobert Speicher2015-05-235-6/+40
| | | | | |
* | | | | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqMarin Jankovski2015-05-271-1/+7
|\ \ \ \ \ \
| * | | | | | Added v7.4.4 and .5 to the CHANGELOGPatricio Cano2015-05-271-1/+7
| | | | | | |
* | | | | | | Merge branch 'rs-title-change-note' into 'master'Douwe Maan2015-05-278-8/+96
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a note when an Issue or Merge Request's title changes > ![Screen_Shot_2015-05-26_at_9.40.19_PM](https://gitlab.com/gitlab-org/gitlab-ce/uploads/f05c6a7b9f489ce66560cfe724184ec9/Screen_Shot_2015-05-26_at_9.40.19_PM.png) Closes #1434 See merge request !717
| * | | | | | | Change one-character variable namers-title-change-noteRobert Speicher2015-05-272-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | | | Add a note when an Issue or Merge Request's title changesRobert Speicher2015-05-268-8/+96
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'fix-hipchat-default-api-version' into 'master'Douwe Maan2015-05-273-5/+29
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow HipChat API version to be blank and default to v2 ### What does this MR do? This MR fixes a regression introduced in v7.11 that requires a HipChat API version to be specified when it is supposed to be optional. ### Why was this MR needed? The "optional" HipChat API version in 57c724558 passed in a blank `api_version` when nothing was specified, and the code was not tested. This would cause a 500 Error. ### What are the relevant issue numbers? Closes #772 See merge request !718
| * | | | | | | Allow HipChat API version to be blank and default to v2Stan Hu2015-05-263-5/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #772
View Lorry Controller Status