summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Improve copy for the pending state42119-non-triggeredFilipa Lacerda2018-01-222-3/+3
|
* Improve pending case testFilipa Lacerda2018-01-221-2/+2
|
* Adds information for pending stateFilipa Lacerda2018-01-222-6/+12
|
* Update testsFilipa Lacerda2018-01-191-2/+1
|
* Do not render non triggered empty state for pending jobsFilipa Lacerda2018-01-193-5/+19
| | | | Put back non triggered information
* Merge branch '41532-email-reason' into 'master'Sean McGivern2018-01-1917-94/+288
|\ | | | | | | | | | | | | Show why a notification email was sent Closes #41532 and #1366 See merge request gitlab-org/gitlab-ce!16160
| * Initial work to add notification reason to emailsMario de la Ossa2018-01-1617-94/+288
| | | | | | | | | | | | | | | | | | | | | | Adds `#build_notification_recipients` to `NotificationRecipientService` that returns the `NotificationRecipient` objects in order to be able to access the new attribute `reason`. This new attribute is used in the different notifier methods in order to add the reason as a header: `X-GitLab-NotificationReason`. Only the reason with the most priority gets sent.
* | Merge branch 'sh-fix-authorized-keys-docs' into 'master'Nick Thomas2018-01-191-1/+1
|\ \ | | | | | | | | | | | | Fix incorrect path for gitlab-shell authorized keys helper See merge request gitlab-org/gitlab-ce!16571
| * | Fix incorrect path for gitlab-shell authorized keys helpersh-fix-authorized-keys-docsStan Hu2018-01-181-1/+1
| | |
* | | Merge branch '26296-update-styling-disabled-buttons' into 'master'Phil Hughes2018-01-196-19/+44
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Review styling of disabled buttons" Closes #26296 See merge request gitlab-org/gitlab-ce!16501
| * | | Change cursor to default for disabled buttons26296-update-styling-disabled-buttonsAnnabel Dunstone Gray2018-01-182-2/+2
| | | |
| * | | Remove hover states from disabled buttonsAnnabel Dunstone Gray2018-01-172-16/+21
| | | |
| * | | Update styling of all disabled buttonsAnnabel Dunstone Gray2018-01-165-13/+33
| | | |
* | | | Merge branch 'tz-fix-ide-bugs' into 'master'Phil Hughes2018-01-1925-77/+169
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | WebIDE: Fix Commit bugs See merge request gitlab-org/gitlab-ce!16459
| * | | | WebIDE: Fix Commit bugsTim Zallmann2018-01-1925-77/+169
|/ / / /
* | | | Merge branch '42157-41989-fix-duplicate-in-create-item-dropdown' into 'master'Phil Hughes2018-01-194-1/+135
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix duplicate item in protected branch/tag dropdowns Closes #42157 and #41989 See merge request gitlab-org/gitlab-ce!16540
| * | | | Fix duplicate item in protected branch/tag dropdown42157-41989-fix-duplicate-in-create-item-dropdownEric Eastwood2018-01-184-1/+135
| | | | | | | | | | | | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/42157 Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/41989
* | | | | Merge branch 'fix-derefenced-target' into 'master'Douwe Maan2018-01-191-2/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix dereferenced_target naming in Gitlab::Git::Ref initialize See merge request gitlab-org/gitlab-ce!16504
| * | | | | Fix dereferenced_target naming in Gitlab::Git::Ref initializeSerdar Dogruyol2018-01-171-2/+2
| | | | | |
* | | | | | Merge branch 'fix-description-loss' into 'master'Phil Hughes2018-01-192-0/+51
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add confirm when navigating away from page Closes #42102 See merge request gitlab-org/gitlab-ce!16518
| * | | | | | Fix eslintfix-description-lossJacob Schatz2018-01-181-4/+2
| | | | | | |
| * | | | | | Remove Event listener and make code more readable.Jacob Schatz2018-01-181-4/+8
| | | | | | |
| * | | | | | Add confirm when navigating away from page with tests.Jacob Schatz2018-01-182-0/+49
| | | | | | |
* | | | | | | Merge branch '42159-utf8-uploads' into 'master'Douwe Maan2018-01-193-11/+17
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Correctly escape UTF-8 path elements for uploads Closes #42159 See merge request gitlab-org/gitlab-ce!16560
| * | | | | | | Correctly escape UTF-8 path elements for uploadsNick Thomas2018-01-183-11/+17
| | | | | | | |
* | | | | | | | Merge branch '34055-issues-enabled-filter-misbehavior' into 'master'James Lopez2018-01-194-2/+35
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Projects API: filter 'with_issues_enabled=true' returns projects with 'issues_enabled=false'" Closes #34055 See merge request gitlab-org/gitlab-ce!12724
| * | | | | | | Resolve "Projects API: filter 'with_issues_enabled=true' returns projects ↵Jan Christophersen2018-01-194-2/+35
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | with 'issues_enabled=false'"
* | | | | | | Merge branch 'dispatcher-project-mr-edit' into 'master'Jacob Schatz2018-01-194-11/+34
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor dispatcher project mr edit and creation diff path See merge request gitlab-org/gitlab-ce!16404
| * | | | | | | Refactor dispatcher project mr edit and creation diff pathClement Ho2018-01-184-11/+34
| | | | | | | |
* | | | | | | | Merge branch 'dispatcher-groups' into 'master'Jacob Schatz2018-01-1817-75/+149
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dynamic imports for groups: pages See merge request gitlab-org/gitlab-ce!16342
| * | | | | | | | dynamic imports for groups: pagesSimon Knox2018-01-1817-75/+149
|/ / / / / / / /
* | | | | | | | Merge branch '42154-fix-artifact-size-calc' into 'master'Robert Speicher2018-01-183-1/+12
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Bug calculating artifacts size for project statistics" Closes #42154 See merge request gitlab-org/gitlab-ce!16539
| * | | | | | | | Fix a bug calculating artifact size for project statisticsNick Thomas2018-01-183-1/+12
| | | | | | | | |
* | | | | | | | | Merge branch '42187-update-gitlab-styles-to-2-3-0' into 'master'Robert Speicher2018-01-185-86/+75
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Update gitlab-styles to 2.3.0" Closes #42187 See merge request gitlab-org/gitlab-ce!16558
| * | | | | | | | | Update rubocop, rubocop-rspec, and gitlab-styles42187-update-gitlab-styles-to-2-3-0Rémy Coutable2018-01-185-86/+75
| | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | Merge branch '41247-timestamp' into 'master'Robert Speicher2018-01-185-24/+58
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use last_edited_at instead of updated_at for displaying issuable last change Closes #41247 See merge request gitlab-org/gitlab-ce!16406
| * | | | | | | | | Return last edited time instead of update time41247-timestampJan Provaznik2018-01-185-24/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For issuable models we keep two timestamps: updated_at which is updated whenever any model attribute is changed, last_edited_at which is changed when only title or description is changed. In UI bellow description we display who and when updated the item. But last_edited_by (used for 'who') is mistakenly combined with updated_at (when), last_edited_at should be used instead. Closes #41247
* | | | | | | | | | Merge branch '42190-make-edit-labels-in-the-issuable-sidebar-consistent' ↵Clement Ho2018-01-184-6/+6
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Resolve ""Edit" labels in the issuable sidebar are not consistent" Closes #42190 See merge request gitlab-org/gitlab-ce!16565
| * | | | | | | | | | Make the 'Edit' links consistent in the issuable sidebar42190-make-edit-labels-in-the-issuable-sidebar-consistentRémy Coutable2018-01-184-6/+6
| | |_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | | Merge branch 'dispatcher-projects-mr-creation-new' into 'master'Jacob Schatz2018-01-182-14/+21
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor dispatcher project mr creations new path See merge request gitlab-org/gitlab-ce!16403
| * | | | | | | | | | Refactor dispatcher project mr creations new pathClement Ho2018-01-182-14/+21
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'tz-karma-libraries-upgrade' into 'master'Filipa Lacerda2018-01-183-234/+1259
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upgraded Karma Dependencies See merge request gitlab-org/gitlab-ce!16402
| * | | | | | | | | | Upgraded Karma DependenciesTim Zallmann2018-01-183-234/+1259
|/ / / / / / / / / /
* | | | | | | | | | Merge branch '42186-username-trailing-space' into 'master'Filipa Lacerda2018-01-181-3/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Comment author link text has a trailing space" Closes #42186 See merge request gitlab-org/gitlab-ce!16567
| * | | | | | | | | | Remove trailing space after author name in note headerAnnabel Dunstone Gray2018-01-181-3/+1
| | | | | | | | | | |
* | | | | | | | | | | Merge branch 'rc/improve-mr-feature-specs' into 'master'Robert Speicher2018-01-1860-1748/+1087
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve MR feature specs and reduce duplication See merge request gitlab-org/gitlab-ce!13237
| * | | | | | | | | | Improve MR feature specs and reduce duplicationrc/improve-mr-feature-specsRémy Coutable2018-01-1860-1748/+1087
| | |_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | | Merge branch 'jramsay-3953-fast-ssh-ce-docs' into 'master'Marcia Ramos2018-01-181-0/+6
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add release added and release backported to CE See merge request gitlab-org/gitlab-ce!16553
| * | | | | | | | | | Add EE version and CE issue linkjramsay-3953-fast-ssh-ce-docsJames Ramsay2018-01-181-2/+3
| | | | | | | | | | |
| * | | | | | | | | | Add release added and release backported to CEJames Ramsay2018-01-181-0/+5
| | | | | | | | | | |