summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | Removed hack25897-textarea-stops-accepting-space-and-return-characters-with-no-warningLuke "Jared" Bennett2016-12-211-7/+0
| | |_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge branch 'fix/group-path-rename-error' into 'master' Douwe Maan2016-12-217-10/+83
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix error 500 renaming group. Also added specs and changelog. Closes #17922 and #23223 See merge request !8201
| * | | | | | | | | | | | | | fix reset pathfix/group-path-rename-errorJames Lopez2016-12-211-1/+1
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | added more specsJames Lopez2016-12-213-4/+8
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | update controller action to render error in formJames Lopez2016-12-211-4/+1
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Fix error 500 renaming group. Also added specs and changelog.James Lopez2016-12-207-11/+83
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge remote-tracking branch 'dev/master'Robert Speicher2016-12-210-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | apply margin on alert banners only when there is one or more alertsMike Greiling2016-12-201-2/+4
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch '25561-maintain-milestone-filter-param' into 'master' Fatih Acet2016-12-214-6/+99
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevent erasing Milestone filter when updating other filters Closes #25561 See merge request !8117
| * | | | | | | | | | | | | | | Maintain milestone filter option when updating filter25561-maintain-milestone-filter-paramSam Rose2016-12-214-6/+99
| | |_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Setup teaspoon tests for Issuable
* | | | | | | | | | | | | | | Merge branch 'fix-copy-issues-empty-state' into 'master' Annabel Dunstone Gray2016-12-212-3/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix copy in Issue Tracker empty state See merge request !8202
| * | | | | | | | | | | | | | | Simplify copy in issues empty statefix-copy-issues-empty-statePedro Moreira da Silva2016-12-211-1/+1
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Add changelog for !8202.Pedro Moreira da Silva2016-12-201-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/8202
| * | | | | | | | | | | | | | | Fix copy in Issue Tracker empty state.Pedro Moreira da Silva2016-12-201-2/+2
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge branch 'multipart-uploaded-file' into 'master' Rémy Coutable2016-12-212-5/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Inject ::UploadedFile from Multipart middleware Closes #25888 See merge request !8215
| * | | | | | | | | | | | | | | Inject ::UploadedFile from Multipart middlewareJacob Vosmaer2016-12-212-5/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I mistakenly concluded Rack::Multipart injects File instances into the params. These should be UploadedFile instances. This reuses a mock UploadedFile class we already had in GitLab.
* | | | | | | | | | | | | | | | Merge branch '25898-ci-icon-color-mr' into 'master' Jacob Schatz2016-12-212-1/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds CSS class to status icon on MR widget to prevent non-colored icon Closes #25898 See merge request !8219
| * | | | | | | | | | | | | | | Adds CSS class to status icon on MR widget to prevent non-colored iconFilipa Lacerda2016-12-212-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds MR id to changelor
* | | | | | | | | | | | | | | | Merge branch 'dz-rename-invalid-groups' into 'master' Douwe Maan2016-12-213-2/+88
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename groups with .git in the end of the path Closes #25862 See merge request !8199
| * | | | | | | | | | | | | | | | Rename groups with .git in the end of the pathDmitriy Zaporozhets2016-12-213-2/+88
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | | | | | | | | | | | Merge branch 'dz-whitelist-dashboard-project-path' into 'master' Douwe Maan2016-12-212-1/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow projects with dashboard as path See merge request !8216
| * | | | | | | | | | | | | | | | Allow projects with dashboard as pathDmitriy Zaporozhets2016-12-212-1/+6
| |/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | | | | | | | | | | Merge branch 'authentiq-id-oauth-support' into 'master' Rémy Coutable2016-12-2110-3/+91
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added support for Authentiq OAuth provider See merge request !8038
| * | | | | | | | | | | | | | | | Added support for Authentiq oauth providerAlex2016-12-2110-3/+91
| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch '25895-fix-headers-in-ci-api-helpers' into 'master' Kamil Trzciński2016-12-213-1/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure nil User-Agent doesn't break the CI API Closes #25895 See merge request !8213
| * | | | | | | | | | | | | | | | | Ensure nil User-Agent doesn't break the CI APIRémy Coutable2016-12-213-1/+10
| | |_|_|_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | | | | | | | | | Merge branch 'badge-color-on-white-bg' into 'master' Fatih Acet2016-12-2110-22/+32
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | added lighter count badge background-color for on white backgrounds See merge request !7873
| * | | | | | | | | | | | | | | | Merge branch 'master' into 'badge-color-on-white-bg'Dimitrie Hoekstra2016-12-21546-4050/+15308
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/assets/stylesheets/pages/pipelines.scss
| * | | | | | | | | | | | | | | | fixed variable, plus added light text color for light badgesbadge-color-on-white-bgDimitrie Hoekstra2016-12-162-1/+3
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Merge branch 'master' into 'badge-color-on-white-bg'Dimitrie Hoekstra2016-12-161056-4251/+23898
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/assets/stylesheets/framework/nav.scss # app/assets/stylesheets/pages/environments.scss # app/views/layouts/nav/_group.html.haml # app/views/layouts/nav/_project.html.haml
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into 'badge-color-on-white-bg'Dimitrie Hoekstra2016-12-04306-2915/+4767
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/assets/stylesheets/framework/nav.scss
| * | | | | | | | | | | | | | | | | | created framework for badges, solving duplicate codeDimitrie Hoekstra2016-12-026-21/+18
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Added lighter count badge background-color for on white backgroundsDimitrie Hoekstra2016-12-017-8/+16
| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge branch 'fix/import-labels-error' into 'master' Douwe Maan2016-12-213-5/+49
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Import/Export labels error Closes #24257 See merge request !8212
| * | | | | | | | | | | | | | | | | | add changelogfix/import-labels-errorJames Lopez2016-12-211-0/+4
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Fix error importing label priorities and added relevant specJames Lopez2016-12-212-5/+45
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge branch '25225-fix-inconsistent-merge-button-styles' into 'master' Alfredo Sumaran2016-12-212-44/+27
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Homogenize revert and cherry-pick button styles generated by commits_helper.rb Closes #25225 See merge request !8053
| * | | | | | | | | | | | | | | | | | Set “Remove branch” button to default sizeAlfredo Sumaran2016-12-211-1/+1
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | remove unused helper methodMike Greiling2016-12-211-14/+0
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | reduce common code even further to satisfy rake flayMike Greiling2016-12-211-23/+25
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | remove button class size alteration from revert and cherry pick linksMike Greiling2016-12-212-4/+4
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | factor out common code to satisfy rake flayMike Greiling2016-12-211-18/+16
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | homogenize revert and cherry-pick button styles generated by commits_helperMike Greiling2016-12-211-7/+4
| |/ / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | Merge branch '25681-network-graph-long-commit-msg' into 'master' Alfredo Sumaran2016-12-211-6/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Account for newlines in commit messages on network graph Closes #25681 and #21086 See merge request !8131
| * | | | | | | | | | | | | | | | | Respect newlines in commit messages on network graph25681-network-graph-long-commit-msgSam Rose2016-12-161-6/+12
| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge branch 'remove-u2f-error-logging' into 'master' Alfredo Sumaran2016-12-216-5/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Display error code for U2F errors See merge request !7305
| * | | | | | | | | | | | | | | | | | Display error code for U2F errors (!7305)winniehell2016-11-076-5/+10
| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge branch '25835-alert-wrapper-creates-extra-margin' into 'master' Jacob Schatz2016-12-211-2/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Apply margin on alert banners only when there is one or more alerts ## What does this MR do? Fixes extra margin added to all pages by !8151 ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? ## Screenshots (if relevant) ![screenshot](https://gitlab.com/gitlab-org/gitlab-ce/uploads/f8804454e82a61246d10fa026605fbb3/Screen_Shot_2016-12-19_at_2.04.42_PM.png) ## Does this MR meet the acceptance criteria? - [ ] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if it does - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #25835 See merge request !8209
| * | | | | | | | | | | | | | | | | | apply margin on alert banners only when there is one or more alertsMike Greiling2016-12-201-2/+4
| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge branch 'fix/25843' into 'master' Sean McGivern2016-12-2013-27/+24
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename SlackNotificationService back to SlackService ## What does this MR do? See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/8191#note_20310845 ## What are the relevant issue numbers? Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/25843 /cc @yorickpeterse @stanhu @smcgivern @felipe_artur @ayufan See merge request !8208