summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | VueJS migration, replace {{{ with v-htmlFatih Acet2016-11-102-5/+3
| | | | |
| * | | | Migrate Vue v1 to v2.Fatih Acet2016-11-109-21/+23
| | | | |
| * | | | Bump up vue version.Fatih Acet2016-11-102-9232/+6672
| | | | |
* | | | | Merge branch 'ux-guide-restructure' into 'master' Achilleas Pipinellis2016-11-1161-1/+600
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | UX guide restructure The goal of this MR was to update the current UI guide to more of an UX guide (starting to detail when to use certain controls and patterns), and add structure to help organize the information. This initial version of the UX guide also lays down the groundwork for principles and personality. This guide is currently documenting the existing design, and will continue to be updated as the design evolves. Some inspiration/references used: - https://medium.com/ge-design/ges-predix-design-system-8236d47b0891#.nkf0chj8r - http://uxcellence.com/2015/11/04/product-principles/ - https://blog.asana.com/2013/10/design-principles/ See merge request !7142
| * | | | Update README.md to link to UX guideVictor Wu2016-11-111-0/+4
| | | | |
| * | | | Remove <br> and replace GFM blockquote with the Markdown generalAchilleas Pipinellis2016-11-117-84/+10
| | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | Rename README.md to index.mdAchilleas Pipinellis2016-11-111-6/+0
| | | | |
| * | | | [ci skip] Establish basic structure for ux_guide README.mdux-guide-restructureawhildy2016-11-1060-1/+676
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Block out pages needed for ux_guide Add resources stub to ux_guide home Fill out principles and basics Add TOC to basics Move all of UI guide to new UX guide structure Add first level structure on ux-guide pages Add more details to buttons Add button images. Update link on development Renamed surfaces to templates. Add tooltip details Update typography and icons on Basics page Add images for color. First draft of voice and tone Delete findings page Refine pages. Fill out Surfaces pages Clean up layout on basics, surfaces, features. Add anchorlinks and counts to components Fill out components page Add item title and system info block Fill out Features page Switch tooltip placement image
* | | | | Merge branch '19205-group-header-redesign' into 'master' Annabel Dunstone Gray2016-11-118-57/+45
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 19205 Redesign group page header to match new navigation ## What does this MR do? Redesigns group page to match comps ## Screenshots (if relevant) Before: ![Screen_Shot_2016-11-08_at_12.50.53_PM](/uploads/6c958e2ab05c1a73c9a96de25490ba2b/Screen_Shot_2016-11-08_at_12.50.53_PM.png) After: ![Screen_Shot_2016-11-08_at_12.50.34_PM](/uploads/822f81df8a0f82a4bdeee3739be5d1f7/Screen_Shot_2016-11-08_at_12.50.34_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 #19205 See merge request !7363
| * | | | | 19205 Redesign group page header to match new navigation19205-group-header-redesigntauriedavis2016-11-098-57/+45
| | | | | |
* | | | | | Merge branch '21764-build-page-title' into 'master' Fatih Acet2016-11-115-8/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove project_title additions from builds and environments ## What does this MR do? Removed soon-to-be un-needed project title additions from builds and environments. **This MR depends on !5998, which introduces subnav to these pages. Without it we're just removing a useful link.** ## Are there points in the code the reviewer needs to double check? @iamphill Is this right of me? One of these still exists in `projects/artifacts/browse`, I'm not sure whether to fix the issue with `project_title`, which already has some issues with its chevron, or just remove it as it will soon be redundant. ## Why was this MR needed? ## Screenshots (if relevant) **BEFORE:** ![Screen_Shot_2016-10-27_at_14.58.22](/uploads/2915289fb06603c33d1abbcdab70c962/Screen_Shot_2016-10-27_at_14.58.22.png) **AFTER:** ![Screen_Shot_2016-10-27_at_14.58.29](/uploads/ad8574aeaa6771737bb9002d749b5559/Screen_Shot_2016-10-27_at_14.58.29.png) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry 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 - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [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) ## What are the relevant issue numbers? Closes #21764 See merge request !6160
| * | | | | | Removed soon-to-be un-needed project title additions from builds and ↵21764-build-page-titleLuke Bennett2016-11-095-8/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | environments Removed unneeded `project_title` code and last reference Added CHANGELOG entry
* | | | | | | Merge branch '23520-mr-sticky-tabs-overlap-discussion-from-anchor' into ↵Fatih Acet2016-11-112-2/+19
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Account for fixed position MR when scrolling to elements ## What does this MR do? This MR accounts for the new merge request fixed affix bar when scrolling to an element on the MR page. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? The fixed MR tabs bar was not being taken into account when shifting permalink scroll targets so that they are unobscured by navigation elements. ## Screenshots (if relevant) Issues discussion permalink: ![Screen_Shot_2016-10-26_at_12.29.26_AM](/uploads/e278f784252f2b79c466f56b4f36d198/Screen_Shot_2016-10-26_at_12.29.26_AM.png) Merge request discussion permalink: ![Screen_Shot_2016-10-26_at_12.28.26_AM](/uploads/1e57357fffb815b217484f09377f3c23/Screen_Shot_2016-10-26_at_12.28.26_AM.png) Merge request diff permalink: ![Screen_Shot_2016-10-26_at_12.29.02_AM](/uploads/269f3a4a4075932355f665322387db86/Screen_Shot_2016-10-26_at_12.29.02_AM.png) Commit diff page permalinks work as well, but aren't highlighted currently (see: #23696) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG.md) entry added - Tests - [x] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [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 it does - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #23520 See merge request !7051
| * | | | | | | Account for merge request fixed affix bar23520-mr-sticky-tabs-overlap-discussion-from-anchorLuke Bennett2016-11-102-2/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | account for merge request fixed affix bar when adjusting scroll targets
* | | | | | | | Merge branch '22699-group-permssion-background-migration' into 'master' Yorick Peterse2016-11-113-1/+54
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix project records with invalid visibility_level values See merge request !7391
| * | | | | | | | Fix project records with invalid visibility_level valuesNick Thomas2016-11-103-1/+54
| | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The AddVisibilityLevelToGroups migration introduced a visibility_level for namespaces and specified that projects should always have a visibility level less than or equal to their namespace. However, some invalid rows could have been created. This commit introduces a migration that updates the invalid rows, setting the invalid project to have the same visibility_level as their namespaces. This will make some projects internal or private when they would previously have been public or internal, but this is better than silently making an internal or private group public.
* | | | | | | | Merge branch 'adam-fix-collapsed-diff-symlink-file-conversion' into 'master' Sean McGivern2016-11-117-4/+23
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the collapsed diff when converting a symlink to a regular file #21610 !6828 See merge request !6953
| * | | | | | | | Fix expanding a collapsed diff when converting a symlink to a regular fileadam-fix-collapsed-diff-symlink-file-conversionAdam Niedzielski2016-11-107-4/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In this case comparing old_path and new_path is not enough because there are two entires that match.
* | | | | | | | | Merge branch 'milestone-project-require' into 'master' Sean McGivern2016-11-113-2/+6
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Require projects before creating milestone Closes #24101 See merge request !7301
| * | | | | | | | | Require projects before creating milestonegfyoung2016-11-103-2/+6
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Merge branch 'mrchrisw/fix-github-link' into 'master' Achilleas Pipinellis2016-11-111-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use GitLab.com link, remove GitHub link Fix dead link GitHub=>GitLab See merge request !7418
| * | | | | | | | | Use GitLab.com link, remove GitHub linkmrchrisw/fix-github-linkChris Wilson2016-11-111-1/+1
|/ / / / / / / / /
* | | | | | | | | Merge branch 'use-config-param' into 'master' Sean McGivern2016-11-111-1/+1
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | Use config param in `Repository#update_ref!` See merge request !7395
| * | | | | | | | Use config param in `Repository#update_ref!`teru2016-11-101-1/+1
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge branch '24369-remove-additional-padding' into 'master' Annabel Dunstone Gray2016-11-102-0/+5
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove additional padding on right-aligned items in MR widget. ## What does this MR do? Remove additional padding on right-aligned items in MR widget. So links look aligned. ## Are there points in the code the reviewer needs to double check? No. ## Why was this MR needed? Because the links are not aligned. ## Screenshots (if relevant) ![Screen_Shot_2016-11-10_at_22.38.26](/uploads/a1deacb77483125df3c25c320f53b579/Screen_Shot_2016-11-10_at_22.38.26.png) ## Does this MR meet the acceptance criteria? - [x] [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 - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [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 it does - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #24369 See merge request !7411
| * | | | | | | | Remove additional padding on right-aligned items in MR widget.Didem Acet2016-11-102-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #24369.
* | | | | | | | | Merge branch ↵Annabel Dunstone Gray2016-11-102-14/+4
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '24279-issue-merge-request-sidebar-todo-button-style-improvement' into 'master' Removed gray button styling from todo buttons in sidebars ## What does this MR do? Removes gray button styling from todo buttons in sidebars ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? gray buttons are inconsistent and look disabled ## Screenshots (if relevant) before: ![image](/uploads/98644ce1df8c903a2409fa066bca8195/image.png) after: ![image](/uploads/a2eb8a9c40c4e5cc081553647bde8235/image.png) ## Does this MR meet the acceptance criteria? - [x] [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 - [x] All builds are passing - [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [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 it does - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #24279 See merge request !7387
| * | | | | | | | removed gray button styling from todo buttons in sidebars24279-issue-merge-request-sidebar-todo-button-style-improvementDimitrie Hoekstra2016-11-102-14/+4
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge branch '24353-skipped-icon' into 'master' Fatih Acet2016-11-102-1/+3
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resize skipped icon Resizes `skipped` icon to match all other status icons ![Screen_Shot_2016-11-10_at_7.35.07_AM](/uploads/5be0dc0638f12a3c984af747a03ce1e1/Screen_Shot_2016-11-10_at_7.35.07_AM.png) Closes #24353 See merge request !7401
| * | | | | | | | Fix alignment of status icons in commit message list24353-skipped-iconAnnabel Dunstone Gray2016-11-101-0/+2
| | | | | | | | |
| * | | | | | | | Resize skipped iconAnnabel Dunstone Gray2016-11-101-1/+1
| | | | | | | | |
* | | | | | | | | Merge branch '24038-fix-no-register-pane-if-ldap' into 'master' Sean McGivern2016-11-102-0/+7
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix no "Register" tab if ldap auth is enabled (#24038) Closes #24038 See merge request !7274
| * | | | | | | | | Fix no "Register" tab if ldap auth is enabled (#24038)Luc Didry2016-11-102-0/+7
| | |_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit is dedicated to GuilhemB, thanks for supporting me on Tipeee :-)
* | | | | | | | | Merge branch '24048-dropdown-issue-with-devider' into 'master' Fatih Acet2016-11-102-1/+5
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolves divider issue in group setting dropdown ## What does this MR do? This MR resolves the issue #24048 ## Are there points in the code the reviewer needs to double check? NR ## Why was this MR needed? This MR removes extra divider from group setting dropdown when there is only one entry to show. This improves UX ## Screenshots (if relevant) **Before** ![dd-before](/uploads/b4696b610a921a710c6be74fbb212260/dd-before.png) **After** ![Screen_Shot_2016-11-10_at_4.09.36_PM](/uploads/a4ff6efe92ce60837afad079398c3880/Screen_Shot_2016-11-10_at_4.09.36_PM.png) ## Does this MR meet the acceptance criteria? - [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) 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] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [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 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 #24048 See merge request !7398
| * | | | | | | | adds changelog entry file for this MR24048-dropdown-issue-with-deviderNur Rony2016-11-101-0/+4
| | | | | | | | |
| * | | | | | | | resolves divider issue in group setting dropdownNur Rony2016-11-101-1/+1
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge branch 'hide-graph-btn' into 'master' Fatih Acet2016-11-101-1/+1
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make toggle pipeline btn into button element Toggle pipeline graph button was a `div` instead of a `button` :frowning2: See merge request !7404
| * | | | | | | Make toggle pipeline btn into button elementAnnabel Dunstone Gray2016-11-101-1/+1
|/ / / / / / /
* | | | | | | Merge branch 'grapify-token-api' into 'master' Rémy Coutable2016-11-102-47/+31
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Grapify triggers API ## What are the relevant issue numbers? Related to #22928 See merge request !7378
| * | | | | | | Grapify token APIRobert Schilling2016-11-102-47/+31
| |/ / / / / /
* | | | | | | Merge branch 'fix/error-when-invalid-branch-for-new-pipeline-used' into ↵Douwe Maan2016-11-104-7/+62
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Fix error when using invalid branch name when creating a new pipeline ## What does this MR do? This MR fixes `500` error when creating a new pipeline though user interface ("Run pipeline") ## Are there points in the code the reviewer needs to double check? Is this a good approach to catch those exceptions on `Repository` level? ## Does this MR meet the acceptance criteria? - [x] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added - Tests - [x] Added for this feature/bug ## What are the relevant issue numbers? Closes #23982 See merge request !7324
| * | | | | | | Remove redundant rescue from repository keep_aroundfix/error-when-invalid-branch-for-new-pipeline-usedGrzegorz Bizon2016-11-091-5/+1
| | | | | | | |
| * | | | | | | Remove redundant space from repository model codeGrzegorz Bizon2016-11-091-1/+1
| | | | | | | |
| * | | | | | | Add Changelog entry for new pipeline fixGrzegorz Bizon2016-11-071-0/+4
| | | | | | | |
| * | | | | | | Evade some exceptions when using invalid referencesGrzegorz Bizon2016-11-072-1/+54
| | | | | | | |
| * | | | | | | Improve code readability in pipelines controllerGrzegorz Bizon2016-11-071-1/+3
| | | | | | | |
* | | | | | | | Merge branch 'fix-cache-for-commit-status' into 'master' Rémy Coutable2016-11-102-1/+5
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix cache for commit status in commits list to respect branches Fix cache for commit status in commits list to respect branches Closes #24324 See merge request !7372
| * | | | | | | Fix cache for commit status in commits list to respect branchesLin Jen-Shin2016-11-102-1/+5
| | | | | | | |
* | | | | | | | Merge branch 'forking-in-progress-title' into 'master' Sean McGivern2016-11-102-1/+5
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | Use 'Forking in progress' title when appropriate See merge request !7394
| * | | | | | | Use 'Forking in progress' title when appropriatePhilip Karpiak2016-11-092-1/+5
| | |_|/ / / / | |/| | | | |