summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Capitalize button textfix-button-titleAlfredo Sumaran2016-06-211-1/+1
|
* Merge branch '18787-user-img-compare' into 'master' Dmitriy Zaporozhets2016-06-212-25/+34
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Align avatar and commit content within commit row ## What does this MR do? Aligns the user avatar on `Compare` ## What are the relevant issue numbers? Closes #18787 ## Screenshots (if relevant) <img src="/uploads/9525a599989f6a9faca54d9f9c62f755/Screen_Shot_2016-06-20_at_11.25.08_AM.png" width="800px"> <img src="/uploads/6c96ed629f377d69745548309006a520/Screen_Shot_2016-06-20_at_11.25.19_AM.png" width="800px"> See merge request !4764
| * Align avatar and text within commit row18787-user-img-compareAnnabel Dunstone2016-06-202-25/+34
| |
* | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2016-06-2127-97/+191
|\ \
| * \ Merge branch 'notification-dropdown-active-fix' into 'master' Jacob Schatz2016-06-216-11/+10
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed issue with notification dropdown not updating active ## What does this MR do? This fixes an issue where the notification dropdown wouldn't correctly update the selected notification type in the dropdown. I've also added a spinner to show the action is happening & removed the flash message for success. ## What are the relevant issue numbers? Closes #18480 ## Screenshots (if relevant) ![notifications](/uploads/5ed5055d180c12450cea77543ae5f44e/notifications.gif) See merge request !4615
| | * | Updated tests to not look for flash messagenotification-dropdown-active-fixPhil Hughes2016-06-212-4/+2
| | | |
| | * | Fixed notification testsPhil Hughes2016-06-211-2/+2
| | | |
| | * | Fixed issue with notification dropdownn not updating activePhil Hughes2016-06-213-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes bell icon to spinner to show the action is happening Removed the flash message Closes #18480
| * | | Merge branch '18590-banzai-filter-relativelinkfilter-is-slow' into 'master' Yorick Peterse2016-06-215-42/+55
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Optimize Banzai::Filter::RelativeLinkFilter See merge request !4813
| | * | | Optimize Banzai::Filter::RelativeLinkFilterAlejandro Rodríguez2016-06-215-42/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A lot of git operations were being repeated, for example, to build a url you would ask if the path was a Tree, which would call a recursive routine in Gitlab::Git::Tree#where, then ask if the path was a Blob, which would call a recursive routine at Gitlab::Git::Blob#find, making reference to the same git objects several times. Now we call Rugged::Tree#path, which allows us to determine the type of the path in one pass. Some other minor improvement added, like saving commonly used references instead of calculating them each time.
| * | | | Merge branch 'blank-state' into 'master' Jacob Schatz2016-06-216-12/+51
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated blank state for environments and deployments ## What does this MR do? Adds a designed blank state to environments and deployments. @markpundsack do we want to hide the new environments when empty? Looks weird otherwise with the green button at the top. ## What are the relevant issue numbers? Closes #18661 ## Screenshots (if relevant) ![Screen_Shot_2016-06-21_at_09.55.03](/uploads/cf768aba3fd85a596d24b7be4fe6a6c0/Screen_Shot_2016-06-21_at_09.55.03.png) ![Screen_Shot_2016-06-21_at_09.55.10](/uploads/b7b7dba90b613cfa867b084661b36b06/Screen_Shot_2016-06-21_at_09.55.10.png) See merge request !4818
| | * | | | Tests updateblank-statePhil Hughes2016-06-212-4/+5
| | | | | |
| | * | | | Moved new environment link to below blank state textPhil Hughes2016-06-212-4/+8
| | | | | |
| | * | | | Updated blank state for environments and deploymentsPhil Hughes2016-06-215-9/+43
| | | |/ / | | |/| | | | | | | | | | | | Closes #18661
| * | | | Merge branch '18743-sidebar-pin-tooltip' into 'master' Jacob Schatz2016-06-213-12/+29
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Tooltip for pinning sidebar" ## What does this MR do? Adds tooltip to show whether sidebar is pinned/unpinned ## What are the relevant issue numbers? Closes #18743 ## Screenshots (if relevant) ![Screen_Shot_2016-06-17_at_12.14.25_PM](/uploads/162f52084a770012cdc621122acd6c6c/Screen_Shot_2016-06-17_at_12.14.25_PM.png) ![Screen_Shot_2016-06-17_at_12.14.35_PM](/uploads/d9296720aeada972441f48d9a3d2f7f8/Screen_Shot_2016-06-17_at_12.14.35_PM.png) See merge request !4759
| | * | | | Fix tooltip title and persist state18743-sidebar-pin-tooltipAlfredo Sumaran2016-06-211-13/+27
| | | | | |
| | * | | | Update CHANGELOGAnnabel Dunstone2016-06-211-0/+1
| | | | | |
| | * | | | Add tooltip on pin/unpin navAnnabel Dunstone2016-06-212-1/+3
| | | | | |
| * | | | | Merge branch 'fix/builds-api-nil-commit' into 'master' Rémy Coutable2016-06-219-20/+46
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix builds API response that did not include commit data ## What does this MR do? This is fix for problem with builds API response not including information about commit this build is created for. ## What are the relevant issue numbers? Closes #18476 ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [x] API support added - Tests - [x] Added for this feature/bug - [x] All builds are passing - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !4827
| | * | | | | Rename commit_data in Pipeline to commitfix/builds-api-nil-commitGrzegorz Bizon2016-06-214-15/+9
| | | | | | |
| | * | | | | Add Changelog entry for builds API commit data fixGrzegorz Bizon2016-06-211-0/+1
| | | | | | |
| | * | | | | Fix builds API response not including commit dataGrzegorz Bizon2016-06-215-13/+44
| | | | | | |
* | | | | | | Merge branch '18881-horizontal-nav-arrow'Dmitriy Zaporozhets2016-06-218-0/+28
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Update CHANGELOG18881-horizontal-nav-arrowAnnabel Dunstone2016-06-201-0/+1
| | | | | | |
| * | | | | | Add arrow in horizontal scroll fadeAnnabel Dunstone2016-06-207-0/+27
| | | | | | |
* | | | | | | Merge branch 'show-image-id-on-registry-page' into 'master' Rémy Coutable2016-06-215-5/+23
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Show proper image ID on registry page ## What does this MR do? Display the container registry image ID (from the config blob) instead of the first image layer ID ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? To show proper image ID on container_registry page. This only supports manifest V2, since the manifest V1 doesn't expose information about Image ID. ## What are the relevant issue numbers? Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/18159. ## Screenshots (if relevant) ![Screen_Shot_2016-06-21_at_13.16.44](/uploads/db0d3ed8c8b90fafc8dbf1644c2354b0/Screen_Shot_2016-06-21_at_13.16.44.png) - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - Tests - [x] Added for this feature/bug - [ ] All builds are passing - [ ] 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 you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !4821
| * | | | | | | Show proper image ID on registry pageKamil Trzcinski2016-06-215-5/+23
| | | | | | | |
* | | | | | | | Merge branch 'ci-lfs-fetch' into 'master' Rémy Coutable2016-06-215-304/+274
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow to fetch LFS from CI ## What does this MR do? This adds support for fetching LFS object from CI jobs (mostly it's made for supporting GitLab CI). ## What is left? - [x] Write tests covering a new authorization mechanism cc @grzesiek @marin See merge request !4465
| * | | | | | | | Add test coverage to LFS fetchingci-lfs-fetchKamil Trzcinski2016-06-212-289/+242
| | | | | | | | |
| * | | | | | | | Merge remote-tracking branch 'origin/master' into ci-lfs-fetchKamil Trzcinski2016-06-21608-4171/+28415
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| * | | | | | | | Merge remote-tracking branch 'origin/master' into ci-lfs-fetchKamil Trzcinski2016-06-10889-4516/+13105
| |\ \ \ \ \ \ \ \
| * | | | | | | | | WIPKamil Trzcinski2016-06-035-17/+34
| | | | | | | | | |
* | | | | | | | | | Merge branch 'backport_from_ee' into 'master' Valery Sizov2016-06-211-1/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix of on-hover state for 'Edit' button on tree view It's already reviewed and merged to EE, so it's just a back-port. See merge request !4823
| * | | | | | | | | | Fix on-hover state for 'Edit' button on tree viewValery Sizov2016-06-211-1/+1
| | | | | | | | | | |
* | | | | | | | | | | Merge branch '18792-cache-participants-call' into 'master' Yorick Peterse2016-06-213-0/+21
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cache Participable#participants in instance variable See merge request !4803
| * | | | | | | | | | Cache Participable#participants in instance variablePaco Guzman2016-06-213-0/+21
| | | | | | | | | | |
* | | | | | | | | | | Merge branch '17521-gitlab-ci-yml-templates' into 'master' Jacob Schatz2016-06-2160-192/+766
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GitLab CI Yaml template dropdown ## What does this MR do? Make it possible to select a dropdown for an easy start with GitLab CI. ## What are the relevant issue numbers? Closes #17521 ## TODO - [ ] Backend - [x] CHANGELOG item - [x] Fix rubocop failure - [x] API Support - [x] New tests - [x] Add disclaimer to the top of the gitlab-ci.yml - [ ] Frontend - [x] New tests See merge request !4411
| * | | | | | | | | | Add button to add .gitlab-ci.yml file17521-gitlab-ci-yml-templatesAlfredo Sumaran2016-06-201-0/+4
| | | | | | | | | | |
| * | | | | | | | | | fixup! override content methodZ.J. van de Weg2016-06-204-21/+20
| | | | | | | | | | |
| * | | | | | | | | | Add feature test for gitab CI dropdownAlfredo Sumaran2016-06-201-0/+30
| | | | | | | | | | |
| * | | | | | | | | | Incorporate reviewZ.J. van de Weg2016-06-208-17/+34
| | | | | | | | | | |
| * | | | | | | | | | Run rake gitlab:update_templatesZ.J. van de Weg2016-06-2024-19/+160
| | | | | | | | | | |
| * | | | | | | | | | Add changelog item, fix rubocop issueZ.J. van de Weg2016-06-202-1/+2
| | | | | | | | | | |
| * | | | | | | | | | Add GitLab CI Yml dropdown selectorAlfredo Sumaran2016-06-205-2/+42
| | | | | | | | | | |
| * | | | | | | | | | Implement backend gitlab ci dropdownZ.J. van de Weg2016-06-208-80/+126
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit builds on the groundwork in ee008e300b1ec0abcc90e6a30816ec0754cea0dd, which refactored the backend so the same code could be used for new dropdowns. In this commit its used for templates for the `.gitlab-ci.yml` files.
| * | | | | | | | | | Add first templates for gitlab-ci dropdownZ.J. van de Weg2016-06-2015-0/+256
| | | | | | | | | | |
| * | | | | | | | | | Refactor Gitlab::GitignoresZJ van de Weg2016-06-2012-143/+183
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'feature/runner-lock-on-project' into 'master' Rémy Coutable2016-06-2125-129/+431
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make it possible to lock runner on a specific project Make it possible to lock runner on a specific project. ![Screen_Shot_2016-06-20_at_4.03.08_PM](/uploads/186378643a20106ff0b67b6fd8bd7f28/Screen_Shot_2016-06-20_at_4.03.08_PM.png) ---- ![Screen_Shot_2016-06-20_at_9.54.52_PM](/uploads/c479abdffaf19f383bb6b5a42bdd6cc3/Screen_Shot_2016-06-20_at_9.54.52_PM.png) ---- ![Screen_Shot_2016-06-20_at_9.56.26_PM](/uploads/6ad838679b0c28a1fe2e20e9224387ea/Screen_Shot_2016-06-20_at_9.56.26_PM.png) Closes #3407 See merge request !4093
| * | | | | | | | | | Update wordings according to:Lin Jen-Shin2016-06-213-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4093#note_12594802
| * | | | | | | | | | Merge remote-tracking branch 'upstream/master' into ↵feature/runner-lock-on-projectLin Jen-Shin2016-06-2010-14/+92
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/runner-lock-on-project * upstream/master: Add notification_settings:events to schema Fixed mobile styling Set path for pinned nav cookie Fixed placement of close button on merge requests using request dot path instead Turn note into normal text Document environments and deployments Tweak grammar fix double query string in url Broken instructions. git fetch --all --tags doesn't refresh tags