summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Merge branch 'rs-persist-tab-selection' into 'master'Dmitriy Zaporozhets2015-05-283-58/+96
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Persist current merge request tab selection via URL Closes internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2350 See merge request !728
| * | | Persist current merge request tab selection via URLrs-persist-tab-selectionRobert Speicher2015-05-273-58/+96
| |/ / | | | | | | | | | Closes internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2350
* | | Merge branch 'header-icons' into 'master'Dmitriy Zaporozhets2015-05-281-2/+2
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change some header icons icons changed: * profile settings: user icon to cog * admin area: cogs to wrench Based on https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/719#note_1289290 ![Screenshot_2015-05-27_17.58.12](https://gitlab.com/gitlab-org/gitlab-ce/uploads/762de4afb8ae229a96ead8b2d213b2a4/Screenshot_2015-05-27_17.58.12.png) See merge request !726
| * | Replace some icons in headerheader-iconsDmitriy Zaporozhets2015-05-271-2/+2
| |/ | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | Merge branch 'browse-milestone-issues' into 'master'Douwe Maan2015-05-2710-34/+102
|\ \ | | | | | | | | | | | | | | | | | | | | | Fix milestone "Browse Issues" button. After refactoring around issue/merge requests filters, the button stopped working :( See merge request !699
| * | Add Browse Issues button to Dashboard and Group milestones.Douwe Maan2015-05-274-4/+10
| | |
| * | Fix milestone "Browse Issues" button.Douwe Maan2015-05-272-3/+3
| | |
| * | Set milestone on new issue when creating issue from index with milestone ↵Douwe Maan2015-05-274-27/+89
| | | | | | | | | | | | filter active.
* | | Merge branch 'fix-disabled-project-snippet-feature' into 'master'Douwe Maan2015-05-271-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-271-1/+1
| | |/ | |/| | | | | | | Closes #1705
* | | Merge branch 'fix-safari-clone-url' into 'master'Douwe Maan2015-05-271-1/+4
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-241-1/+4
| | | | | | | | | | | | Closes #9326
* | | Merge branch 'support-file-attachments-milestones' into 'master'Douwe Maan2015-05-271-0/+1
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-251-0/+1
| | | | | | | | | | | | Closes #1648
* | | 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-272-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-252-2/+2
| | |/ / | |/| |
* | | | Merge branch 'commit-graphs-by-email' into 'master'Dmitriy Zaporozhets2015-05-271-7/+13
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | Group project contributions by both name and email.Douwe Maan2015-05-251-7/+13
| | | | |
* | | | | Merge branch 'emailsonpush-prefix' into 'master'Dmitriy Zaporozhets2015-05-271-1/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-251-1/+2
| |/ / / /
* | | | | Merge branch 'accepted-rejected-mrs' into 'master'Dmitriy Zaporozhets2015-05-2715-25/+47
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | Add Accepted and Rejected tabs to MR lists.Douwe Maan2015-05-259-13/+35
| | | | |
| * | | | Consistently refer to MRs as either Accepted or Rejected.Douwe Maan2015-05-256-12/+12
| |/ / /
* | | | Merge branch 'rs-to_reference' into 'master'Dmitriy Zaporozhets2015-05-2716-85/+347
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | | |
| * | | | 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-261-6/+4
| | | | |
| * | | | 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-2611-9/+114
| | | | |
| * | | | Update CommitRange#to_reference to use full SHAsRobert Speicher2015-05-261-3/+6
| | | | | | | | | | | | | | | | | | | | We only want them shortened by the filter, which calls to_s
| * | | | 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
| | | | |
| * | | | Minor model spec cleanupsRobert Speicher2015-05-261-1/+2
| | | | | | | | | | | | | | | | | | | | Snippet model was missing project association
| * | | | Add `to_reference` for models that support referencesRobert Speicher2015-05-2610-16/+138
| | | | | | | | | | | | | | | | | | | | | | | | | 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-273-3/+34
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-231-1/+1
| | | | | |
| * | | | | Add support for manually entering 2FA detailsRobert Speicher2015-05-233-3/+34
| | |_|_|/ | |/| | |
* | | | | Merge branch 'rs-title-change-note' into 'master'Douwe Maan2015-05-274-0/+32
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | Add a note when an Issue or Merge Request's title changesRobert Speicher2015-05-264-0/+32
| | |/ / / | |/| | |
* | | | | Merge branch 'fix-hipchat-default-api-version' into 'master'Douwe Maan2015-05-271-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-261-1/+1
| | |_|_|/ | |/| | | | | | | | | | | | | Closes #772
* | | | | Merge branch 'fix-typo-in-email' into 'master'Robert Speicher2015-05-262-4/+4
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | Fix "Asignee" typo in new issue/merge request emails See merge request !676
| * | | | email: fix typoBen Boeckel2015-05-182-4/+4
| | | | |
* | | | | Merge branch 'milestoneRescue' into 'master'Robert Schilling2015-05-262-2/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change percent_complete rescue value from 100 to 0 The percent_complete method returns a value of 100 when a ZeroDivisionError occurs. That seems like a very strange default for an error case, and results in a bug when a milestone has no corresponding issues (new, empty milestones show 100% completion). This commit changes the rescue value to 0, and subsequently fixes #1656, which reported this problem. See merge request !714
View Lorry Controller Status