summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'no-more-bosses' into 'master' 27019-merge-when-pipeline-succeeds-visible-if-approvals-are-pendingStan Hu2017-01-232-10/+10
|\ | | | | | | | | Rename endboss -> maintainer, miniboss -> reviewer See merge request !8719
| * Rename endboss -> maintainer, miniboss -> reviewerno-more-bossesSean McGivern2017-01-132-10/+10
| | | | | | | | | | We want to describe these roles in a way that is more understandable to people not familiar with GitLab.
* | Merge branch ↵Douwe Maan2017-01-2315-56/+243
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | '22619-add-an-email-address-to-unsubscribe-list-header-in-email' into 'master' Handle unsubscribe notification via email Closes #22619 See merge request !6597
| * | Handles unsubscribe from notifications via emailPawel Chojnacki2017-01-1315-56/+243
| |/ | | | | | | | | - allows unsubscription processing of email in format "reply+%{key}+unsubscribe@acme.com" (example) - if config.address includes %{key} and replies are enabled every unsubscriable message will include mailto: link in its List-Unsubscribe header
* | Merge branch '22638-creating-a-branch-matching-a-wildcard-fails' into 'master' Douwe Maan2017-01-233-2/+15
|\ \ | | | | | | | | | | | | | | | | | | Allow creating protected branches when user can merge to such branch Closes #22638 See merge request !8458
| * | Allow creating protected branch when it doesn't existPawel Chojnacki2017-01-133-2/+15
| | | | | | | | | | | | | | | | | | if user has either push or merge permissions + Change log entry for fix to creating a branch matching a wildcard fails
* | | Merge branch '25989-fix-rogue-scrollbars-on-comments' into 'master' Annabel Dunstone Gray2017-01-232-2/+6
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Remove rogue scrollbars from some issue comments Closes #25989 See merge request !8652
| * | | Remove rogue scrollbars for some issue comments25989-fix-rogue-scrollbars-on-commentsEric Eastwood2017-01-192-2/+6
| | | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/25989
* | | | Merge branch 'issue-filter-click-to-search' into 'master' Jacob Schatz2017-01-2312-36/+62
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Allow issue filter submission using mouse only See merge request !8681
| * | | | add CHANGELOG.md entry for !8681issue-filter-click-to-searchMike Greiling2017-01-211-0/+4
| | | | |
| * | | | update tests to correspond with new behaviorMike Greiling2017-01-216-29/+29
| | | | |
| * | | | add a space after selecting a dropdown itemMike Greiling2017-01-212-2/+11
| | | | |
| * | | | allow issue filter submission by clicking "Keep typing and press enter"Mike Greiling2017-01-214-1/+18
| | | | |
| * | | | remove vestigial onsubmit event triggerMike Greiling2017-01-211-4/+0
| | | | |
* | | | | Merge branch '22974-trigger-service-events-through-api' into 'master' Douwe Maan2017-01-2338-74/+137
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | adds events to services api deserialization Closes #22974 See merge request !8324
| * | | | | adds test suite22974-trigger-service-events-through-apiTiago Botelho2017-01-2230-147/+17
| | | | | |
| * | | | | adds events to services api deserializationTiago Botelho2017-01-2237-66/+259
| |/ / / /
* | | | | Merge branch '26787-add-copy-icon-hover-state' into 'master' Annabel Dunstone Gray2017-01-232-4/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add hover style for copy icon in commit page header Closes #26787 See merge request !8619
| * | | | | Add hover style for copy icon in commit page headerRyan Harris2017-01-222-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change hover style definition from explicit rgba value to variable Removed style from page-header.scss that was overriding .btn styles Add hover style for copy icon in commit page header Change hover style definition from explicit rgba value to variable Removed unnecessary styles on commits.scss
* | | | | | Merge branch 'feature/success-warning-icons-in-stages-builds' into 'master' Kamil Trzciński2017-01-2324-210/+741
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use a warning icon for a stage with allowed to fail builds Closes #21948 See merge request !8503
| * | | | | | Fix warnings argument memoization in CI/CD stagefeature/success-warning-icons-in-stages-buildsGrzegorz Bizon2017-01-192-6/+24
| | | | | | |
| * | | | | | Add a default status const to common status concernGrzegorz Bizon2017-01-183-1/+8
| | | | | | |
| * | | | | | Extract compound statuses method in status factoryGrzegorz Bizon2017-01-181-3/+7
| | | | | | |
| * | | | | | Improve readability of specs for pipeline stagesGrzegorz Bizon2017-01-181-39/+64
| | | | | | |
| * | | | | | Pass memoizable warnings attribute to stage objectGrzegorz Bizon2017-01-184-13/+30
| | | | | | |
| * | | | | | Extend pipeline detailed status factory specsGrzegorz Bizon2017-01-121-17/+28
| | | | | | |
| * | | | | | Fix a Rubocop offense in detailed status factoryGrzegorz Bizon2017-01-121-1/+1
| | | | | | |
| * | | | | | Use detailed status for failed but allowed buildsGrzegorz Bizon2017-01-122-14/+118
| | | | | | |
| * | | | | | Add new CI/CD status failed with warnings icon groupGrzegorz Bizon2017-01-122-1/+3
| | | | | | |
| * | | | | | Expose methods that match statuses in status factoriesGrzegorz Bizon2017-01-122-32/+55
| | | | | | |
| * | | | | | Make it possible to combine extended CI/CD statusesGrzegorz Bizon2017-01-122-13/+102
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit also makes it possible to configure exclusive groups. There can be only one detailed status matched within an exclusive group, which is important from the performance perspective.
| * | | | | | Add extended status for build failed but allowed toGrzegorz Bizon2017-01-112-0/+137
| | | | | | |
| * | | | | | Add changelog for warning icon for stage in graphGrzegorz Bizon2017-01-111-0/+4
| | | | | | |
| * | | | | | Add specs for two new methods defined in stage classGrzegorz Bizon2017-01-112-1/+48
| | | | | | |
| * | | | | | Add concrete success warning status to stage factoryGrzegorz Bizon2017-01-119-89/+115
| | | | | | |
| * | | | | | Extract abstract success with warnings CI/CD statusGrzegorz Bizon2017-01-116-34/+51
| | | | | | |
* | | | | | | Merge branch 'fix-readme' into 'master' Rémy Coutable2017-01-231-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change twitter likes URL in README See merge request !8702
| * | | | | | | Fix the most important part of the readme matmen2017-01-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Change the twitter `/favorites` to `/likes`
* | | | | | | | Merge branch 'use-archived-trait' into 'master' Rémy Coutable2017-01-234-4/+4
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use archived trait for project in specs instead model column See merge request !8635
| * | | | | | | | Use archived trait for project in specs instead model columnSemyon Pupkov2017-01-224-4/+4
| | | | | | | | |
* | | | | | | | | Merge branch 'zj-mattermost-fixes' into 'master' Rémy Coutable2017-01-232-8/+8
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mattermost fixes See merge request !8654
| * | | | | | | | | Fix Slack/Mattermost notifaction serviceszj-mattermost-fixesZ.J. van de Weg2017-01-201-7/+7
| | | | | | | | | |
| * | | | | | | | | Remove prefilled prefixZ.J. van de Weg2017-01-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes, at least partially, gitlab-org/gitlab-ce#26755.
* | | | | | | | | | Merge branch 'patch-12' into 'master' Achilleas Pipinellis2017-01-221-1/+1
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | correct the prometheus feature configuration according to https://gitlab.com/git… See merge request !8703
| * | | | | | | | | correct the prometheus feature configuration according to ↵Marcello2017-01-221-1/+1
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/omnibus-gitlab/blob/master/files/gitlab-config-template/gitlab.rb.template#L1147
* | | | | | | | | Merge branch '26622-fix-transient-failure-in-cycle_analytics_events_spec' ↵Robert Speicher2017-01-221-21/+14
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Make cycle_analytics_events_spec.rb side-effect free Closes #26622 See merge request !8594
| * | | | | | | | Make cycle_analytics_events_spec.rb side-effect free26622-fix-transient-failure-in-cycle_analytics_events_specRémy Coutable2017-01-161-21/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | Merge branch 'mr-widget-reload-fix' into 'master' Jacob Schatz2017-01-221-2/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge request widget class names update See merge request !8700
| * | | | | | | | | Merge request widget class names updatemr-widget-reload-fixPhil Hughes2017-01-221-2/+2
| | | | | | | | | |
* | | | | | | | | | Update VERSION to 8.17.0-prev8.17.0.preJames Lopez2017-01-221-1/+1
| | | | | | | | | |