summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Use jQuery niceness on blob_fork_suggestionuse-jquery-on-blob-fork-suggestionEric Eastwood2017-04-223-44/+43
| | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/10602#note_27871752
* Merge branch 'form-focus-previous-incorrect-form' into 'master' Filipa Lacerda2017-04-213-2/+54
|\ | | | | | | | | | | | | Fixed the preview keyboard shortcut focusing wrong tab Closes #31101 See merge request !10849
| * Improved the specform-focus-previous-incorrect-formPhil Hughes2017-04-211-9/+25
| | | | | | | | Now correctly tests against different forms
| * Fixed the preview keyboard shortcut focusing wrong tabPhil Hughes2017-04-213-2/+38
| | | | | | | | Closes #31101
* | Merge branch 'sh-fix-issue-31215-2' into 'master' Douwe Maan2017-04-213-1/+30
|\ \ | | | | | | | | | | | | | | | | | | Based on !10841 Fix Error 500 when referencing issue with project in pending delete Closes #31215 See merge request !10843
| * | Add a changelog entrysh-fix-issue-31215-2Lin Jen-Shin2017-04-211-0/+4
| | |
| * | Also test against external-issue for deleted projectsLin Jen-Shin2017-04-211-5/+17
| | | | | | | | | | | | | | | | | | This is based on: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/10841
| * | Merge remote-tracking branch 'upstream/master' into sh-fix-issue-31215Lin Jen-Shin2017-04-21276-1156/+4021
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: (109 commits) Update CI templates to include 9.1 templates Change spec folder to match the assets one Update style_guide_js.md Milestones documentation refactor Adds documentation entry: Don't user forEach, aim for code without side effects Move kube namespace section to the variables one Changed milestone.to_reference calls into milestone.title for the show, edit and top views Update move icon to match others Issue Title Show Focus Check On Load Update Kubernetes namespace documentation Store projects in metrics for email replies Refactor into .vue files Adds vue js example application and documentation Add ES lint support to identify poorly written Promises Update plantuml.md to add the actual link. Fixed wording Add metrics events for incoming emails Remove helpers assigned_issuables_count and cached_assigned_issuables_count Refactor into .vue files part 2 Fix headings ...
| * | | Fix Error 500 when referencing issue with project in pending deletesh-fix-issue-31215Stan Hu2017-04-202-1/+14
| | | | | | | | | | | | | | | | Closes #31215
* | | | Merge branch 'environments-vue-3' into 'master' Phil Hughes2017-04-2110-310/+357
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Refactor environments components into vue files - part 3 See merge request !10833
| * | | | Refactor environments components into vue files - part 3Filipa Lacerda2017-04-2110-310/+357
|/ / / /
* | | | Merge branch 'fix-user-profile-tabs-showing-raw-json-instead' into 'master' Phil Hughes2017-04-213-15/+22
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix user profile tabs showing raw json when navigating back and forward See merge request !10352
| * | | | Append .json to ajax endpoint to prevent browser to display raw jsonAlfredo Sumaran2017-04-213-15/+22
| | | | | | | | | | | | | | | | | | | | Add CHANGELOG entry
* | | | | Merge branch '26208-animate-drodowns' into 'master' Clement Ho2017-04-2116-26/+124
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding animation for all dropdown Closes #26208 See merge request !8419
| * | | | | Adding animation for all dropdownNur Rony2017-04-2116-26/+124
|/ / / / /
* | | | | Merge branch 'vue-doc-2' into 'master' Phil Hughes2017-04-211-1/+17
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add help regarding vue resource and where to include it See merge request !10819
| * | | | | Add help regarding vue resource and where to include itFilipa Lacerda2017-04-211-1/+17
|/ / / / /
* | | | | Merge branch '31193-ff-copy' into 'master' Douwe Maan2017-04-212-1/+8
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix inline diff copying in firefox Closes #31193 See merge request !10838
| * | | | | fix inline diff copying in firefox31193-ff-copySimon Knox2017-04-212-1/+8
| | | | | |
* | | | | | Merge branch 'dz-refactor-admin-group-members' into 'master' Douwe Maan2017-04-213-2/+34
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor Admin::GroupsController#members_update method and add some specs See merge request !10828
| * | | | | | Refactor Admin::GroupsController#members_update method and add some specsdz-refactor-admin-group-membersDmitriy Zaporozhets2017-04-203-2/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | Merge branch 'docs/mention-microsoft-teams' into 'master' Achilleas Pipinellis2017-04-212-3/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mention Microsoft teams service in project services doc See merge request !10815
| * | | | | | | Mention Microsoft teams service in project services docdocs/mention-microsoft-teamsAchilleas Pipinellis2017-04-202-3/+4
| | | | | | | |
* | | | | | | | Merge branch '2989-run-cicd-pipelines-on-a-schedule-experimental-doc' into ↵Achilleas Pipinellis2017-04-215-1/+29
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Add doc for scheduled trigger Closes #30440 See merge request !10591
| * | | | | | | | Add doc for scheduled triggerDosuken shinya2017-04-215-1/+29
|/ / / / / / / /
* | | | | | | | Merge branch 'fix-user-activity-api' into 'master' Robert Speicher2017-04-211-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix user activities API version in docs [ci skip] See merge request !10822
| * | | | | | | | Fix user activities API version in docsfix-user-activity-apiSean McGivern2017-04-201-1/+1
| | | | | | | | |
* | | | | | | | | Merge branch 'fix/encoding-issue' into 'master' Sean McGivern2017-04-213-1/+15
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix encoding issue exporting a project Closes #31186 See merge request !10824
| * | | | | | | | | Return empty string on UTF8 conversion with U_STRING_NOT_TERMINATED_WARNING ↵fix/encoding-issueJames Lopez2017-04-203-1/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | error
* | | | | | | | | | Merge branch '31189-pipelines-error-state' into 'master' Phil Hughes2017-04-213-7/+25
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Guarantee only one state is shown at a time Closes #31189 See merge request !10835
| * | | | | | | | | | Guarantee only one state is shown at a time31189-pipelines-error-stateFilipa Lacerda2017-04-203-7/+25
| | |_|_|_|_|/ / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'fix-jobs-enabled-parameter' into 'master'Sean McGivern2017-04-213-2/+44
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace builds_enabled with jobs_enabled in projects API v4 Closes #31012 See merge request !10786
| * | | | | | | | | | Add missing newlineswinniehell2017-04-201-0/+6
| | | | | | | | | | |
| * | | | | | | | | | Add missing newlineswinniehell2017-04-201-0/+16
| | | | | | | | | | |
| * | | | | | | | | | Replace builds_enabled with jobs_enabled in projects API v4 (!10786)winniehell2017-04-202-2/+9
| | | | | | | | | | |
| * | | | | | | | | | Add failing test for #31012winniehell2017-04-191-0/+13
| | |_|_|_|_|_|/ / / | |/| | | | | | | |
* | | | | | | | | | Update CHANGELOG.md for 9.0.6James Lopez2017-04-2110-37/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | | | | Merge branch '30637-replace-delete-buttons-get-fork-cancel-confirmation' ↵Filipa Lacerda2017-04-218-29/+129
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Add Fork/Cancel confirmation to "Replace"/"Delete" buttons Closes #30637 See merge request !10602
| * | | | | | | | | Add Fork/Cancel confirmation to "Replace"/"Delete" buttons30637-replace-delete-buttons-get-fork-cancel-confirmationEric Eastwood2017-04-208-29/+129
| | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/30637
* | | | | | | | | Merge branch 'vue-pipelines-folder' into 'master' Phil Hughes2017-04-2111-0/+0
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change spec folder to match the assets one See merge request !10834
| * | | | | | | | | Change spec folder to match the assets onevue-pipelines-folderFilipa Lacerda2017-04-2011-0/+0
| |/ / / / / / / /
* | | | | | | | | Merge branch 'zj-update-ci-templates' into 'master' Kamil Trzciński2017-04-203-8/+86
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update CI templates to include 9.1 templates See merge request !10807
| * | | | | | | | | Update CI templates to include 9.1 templatesZeger-Jan van de Weg2017-04-203-8/+86
|/ / / / / / / / /
* | | | | | | | | Merge branch 'fe-doc-update' into 'master' Filipa Lacerda2017-04-201-0/+10
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | Add parameter limit to styleguide See merge request !10830
| * | | | | | | | Update style_guide_js.mdfe-doc-updateFatih Acet2017-04-201-0/+10
|/ / / / / / / /
* | | | | | | | Merge branch 'no-downtime-check-stable' into 'master' Robert Speicher2017-04-201-1/+7
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't run the downtime check on stable branches, or tags/master See merge request !10794
| * | | | | | | | Don't run the downtime check on stable branches, or tags/masterno-downtime-check-stableDJ Mountney2017-04-191-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The way the check currently works, it runs on the diff between your branch and the latest commit in gitlab on master. This doesn't give a good representation of the changes migrations for stable branches, tags, and master itself.
* | | | | | | | | Merge branch 'kubernetes-service-namespace' into 'master' Achilleas Pipinellis2017-04-201-2/+6
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Kubernetes service namespace Closes #30445 See merge request !10821
| * | | | | | | | | Move kube namespace section to the variables oneAchilleas Pipinellis2017-04-201-9/+6
| | | | | | | | | |
| * | | | | | | | | Update Kubernetes namespace documentationkubernetes-service-namespaceKamil Trzcinski2017-04-201-0/+7
| | |_|_|/ / / / / | |/| | | | | | |