summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* extract pipeline mails layoutAlexis Reigel2017-02-229-335/+264
|
* Merge branch 'global-dropdown-edits' into 'master' Alfredo Sumaran2017-02-173-17/+8
|\ | | | | | | | | Global dropdown edits See merge request !9336
| * Remove application theme settings from preferencesAnnabel Dunstone Gray2017-02-171-7/+0
| |
| * Remove badge styling in dropdown; remove blue outlineAnnabel Dunstone Gray2017-02-172-9/+7
| |
| * Make active links in dropdown boldAnnabel Dunstone Gray2017-02-171-1/+1
| |
* | Merge branch '23819-fix-milestone-counters-to-top-right-of-panel-headings' ↵Clement Ho2017-02-172-3/+23
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Fix position of milestone panel counters Closes #23819 See merge request !7842
| * | Fix position of counters within milestone panelsAndrew Smith2017-02-152-3/+23
| | |
* | | Merge branch '28353-little-grammar-issue' into 'master' Annabel Dunstone Gray2017-02-171-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix grammar issue in admin/runners Closes #28353 See merge request !9344
| * | | Fix grammer issue in admin/runners28353-little-grammar-issueClement Ho2017-02-171-1/+1
| | | |
* | | | Merge branch 'remove-issue-and-mr-counts-from-labels-page' into 'master' Stan Hu2017-02-171-6/+4
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | Remove issue and MR counts from label index Closes #25413 See merge request !9332
| * | | Remove issue and MR counts from labels indexremove-issue-and-mr-counts-from-labels-pageSean McGivern2017-02-171-6/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We were performing two (quite slow, because of the need to do access checks) queries for each label on the page: one to get the count of issues with that label, and one to get the count of merge requests with that label. Until we have a performant way of doing this, remove the counts.
* | | | Merge branch 'fix-merge-service-with-no-source' into 'master' Rémy Coutable2017-02-171-1/+1
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | Fix merge service error with no source See merge request !9348
| * | | Fix merge service error with no sourcefix-merge-service-with-no-sourceSean McGivern2017-02-171-1/+1
| |/ / | | | | | | | | | | | | This shouldn't be possible in CE, but is needed so that the code is the same in CE and EE.
* | | Merge branch '26379-iid-param' into 'master'Rémy Coutable2017-02-173-23/+6
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | add a :iid param to the IssuableFinder Closes #26379 See merge request !9222
| * | | add a :iids param to IssuableFindermhasbini2017-02-173-23/+6
| | | |
* | | | Merge branch 'fix-dependency-in-environments' into 'master' Clement Ho2017-02-174-6/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix dependencies order in environments Closes #28355 See merge request !9343
| * | | | Fix depenendencies loading Vue in EEFilipa Lacerda2017-02-174-6/+6
| | | | |
* | | | | Merge branch 'gfm-autocomplete-fixes' into 'master' Alfredo Sumaran2017-02-171-2/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix errors in GFM slash commands matcher See merge request !8975
| * | | | | Fixes errors in GFM slash commands matcher and add tests for default matcherYarNayar2017-02-171-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | See !8975
* | | | | | Merge branch 'zero-for-unlimited' into 'master' Annabel Dunstone Gray2017-02-171-2/+2
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | changed minor inconsistency in help text See merge request !9333
| * | | | | changed minor inconsistency in help textzero-for-unlimiteddimitrieh2017-02-171-2/+2
| | | | | |
* | | | | | Merge branch 'fix/gb/pipeline-retry-builds-started' into 'master' Kamil Trzciński2017-02-177-44/+84
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make pipeline retry take stages order into account Closes #27431, #23710, and #26551 See merge request !9021
| * | | | | | Remove support for locking in pipeline retry serviceGrzegorz Bizon2017-02-171-9/+1
| | | | | | |
| * | | | | | Merge branch 'master' into fix/gb/pipeline-retry-builds-startedGrzegorz Bizon2017-02-17205-2211/+2285
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (313 commits) Allow slashes in slash command arguments Add API endpoint to get all milestone merge requests remove trailing comma Restore pagination to admin abuse reports replace deprecated NoErrorsPlugin with NoEmitOnErrorsPlugin only compress assets in production Reduce number of pipelines created to test pagination add CHANGELOG.md entry for !8761 prevent diff unfolding link from appearing for deleted files fix build failures only show diff unfolding link if there are more lines to show fix typo in node section Only yield valid references in ReferenceFilter.references_in Cache js selectors; fix css move "Install node modules" step before "Migrate DB" within update process Renders pagination again for pipelines table update migration docs for 8.17 to include minimum node version Add CHANGELOG file Fix positioning of top scroll button Remove comments in migration ...
| * | | | | | Make build clone/retry implementation more robustfix/gb/pipeline-retry-builds-startedGrzegorz Bizon2017-02-161-18/+20
| | | | | | |
| * | | | | | When retrying a build copy a coverage regex settingGrzegorz Bizon2017-02-151-0/+1
| | | | | | |
| * | | | | | Close all pipeline todos at once when retrying itGrzegorz Bizon2017-02-152-1/+5
| | | | | | |
| * | | | | | Make it possible to resolve all todos for pipelineGrzegorz Bizon2017-02-151-0/+6
| | | | | | |
| * | | | | | Avoid race condition in build retry serviceGrzegorz Bizon2017-02-141-3/+2
| | | | | | |
| * | | | | | Simplify implementation of build retry serviceGrzegorz Bizon2017-02-141-8/+2
| | | | | | |
| * | | | | | Revert adding new methods in CI/CD stage classGrzegorz Bizon2017-02-141-12/+0
| | | | | | |
| * | | | | | Simplify implementation of pipeline retry serviceGrzegorz Bizon2017-02-142-44/+6
| | | | | | |
| * | | | | | Use new pipeline retry service with optimistic lockingGrzegorz Bizon2017-02-143-27/+39
| | | | | | |
| * | | | | | Add after_stage scope to commit status classGrzegorz Bizon2017-02-143-12/+10
| | | | | | |
| * | | | | | Reuse `Gitlab::Allowable` mixin in base serviceGrzegorz Bizon2017-02-141-4/+1
| | | | | | |
| * | | | | | Preserve base service abstraction for retry servicesGrzegorz Bizon2017-02-143-47/+48
| | | | | | |
| * | | | | | Fix Rubocop offense in pipeline retry serviceGrzegorz Bizon2017-02-131-1/+0
| | | | | | |
| * | | | | | Implement new pipeline retry serviceGrzegorz Bizon2017-02-133-10/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The new service takes stages order into account.
| * | | | | | Add a separate CI/CD pipeline retry service classGrzegorz Bizon2017-02-132-1/+25
| | | | | | |
| * | | | | | Fix CI build specs after adding retry ability checkGrzegorz Bizon2017-02-131-3/+3
| | | | | | |
| * | | | | | Add specs for build retry serviceGrzegorz Bizon2017-02-131-0/+6
| | | | | | |
| * | | | | | Extract CI/CD build retry code to separate serviceGrzegorz Bizon2017-02-132-26/+44
| | | | | | |
| * | | | | | Skip job only when canceling the pipeline it belongs toGrzegorz Bizon2017-02-132-3/+8
| | | | | | |
| * | | | | | Fix pipeline specs related to canceling buildsGrzegorz Bizon2017-02-131-1/+1
| | | | | | |
| * | | | | | Skip buils that were canceled but not started yetGrzegorz Bizon2017-02-131-1/+2
| | | | | | |
* | | | | | | Merge branch 'task_list_refactor' into 'master' Fatih Acet2017-02-175-92/+68
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | move task_list setup and events to own class See merge request !9016
| * \ \ \ \ \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into task_list_refactortask_list_refactorSimon Knox2017-02-1663-199/+255
| |\ \ \ \ \ \ \
| * | | | | | | | update correct field for Notes - it's called note not descriptionSimon Knox2017-02-154-1/+5
| | | | | | | | |
| * | | | | | | | code style and test fixesSimon Knox2017-02-141-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix test following https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/9172
| * | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into task_list_refactorSimon Knox2017-02-141-1/+6
| |\ \ \ \ \ \ \ \