summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Replace references to MergeRequestDiff#commits with st_commitsuse-st-commits-where-possibleAdam Niedzielski2016-12-0111-44/+73
| | | | | | when we care only about the number of commits We do not have to instantiate all objects in this case.
* Merge branch 'docs/git-submodules-with-ci' into 'master' Achilleas Pipinellis2016-11-304-110/+96
|\ | | | | | | | | | | | | Refactor the Git submodules with CI docs Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/22567 See merge request !7856
| * Refactor the Git submodules with CI docsAchilleas Pipinellis2016-11-304-110/+96
| | | | | | | | [ci skip]
* | Merge branch '25092-change-font-commit-list-in-system-note' into 'master' Fatih Acet2016-11-301-3/+3
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Change font of commit list in a system note according to proposed design" ## What does this MR do? This MR closes #25092 ## Are there points in the code the reviewer needs to double check? NR ## Why was this MR needed? To improve `UX` ## Screenshots (if relevant) **Before** ![before](/uploads/50b72a1f818c5a5dc633b06eee3eff92/before.png) **After** ![after](/uploads/7a488fe22a942af8846fcd202da8f400/after.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 - [x] 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 #25092 See merge request !7822
| * | adjust commit list ul height25092-change-font-commit-list-in-system-noteNur Rony2016-11-301-1/+1
| | |
| * | adjust padding in listNur Rony2016-11-301-1/+1
| | |
| * | makes ul bullets fully visibleNur Rony2016-11-301-1/+1
| | |
| * | shows commits SHAs in monospcase and commit messaages in normal fontNur Rony2016-11-301-1/+1
| |/
* | Merge branch 'issue_24363' into 'master' Fatih Acet2016-11-3012-42/+129
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix appearance in error pages ## What does this MR do? The error pages under `app/views/errors/*` looks like the error page for 404 `public/404.html` ## Are there points in the code the reviewer needs to double check? I restructured how the GitLab logo is shown in the `public/404.html` and all the pages under `app/views/errors/*`. ## Why was this MR needed? #24363 ## Screenshots (if relevant) Before ![Screen_Shot_2016-11-10_at_11.11.48](/uploads/b134195dd2d63d093ec0a6d906761e3f/Screen_Shot_2016-11-10_at_11.11.48.png) After ![Selection_064](/uploads/d57601513d6ab3c0b5e1c7448ecf6ffc/Selection_064.png)![Selection_057](/uploads/50220320bad0b1c14ec8d1e89e490373/Selection_057.png)![Selection_060](/uploads/1e04e4ce36ef7fa5bee4e7916b0e5de2/Selection_060.png)![Selection_059](/uploads/0a4a02a8bae132232d4331adce132d4a/Selection_059.png)![Selection_062](/uploads/3d96f0e8c0e5f0f73b3b51cbb168c76a/Selection_062.png)![Selection_061](/uploads/e127a2b2acc810a9176d02927f1c8dbc/Selection_061.png)![Selection_063](/uploads/e3f682c293539ff195a78018da872abf/Selection_063.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 - [ ] 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) - [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? See merge request !7635
| * | Fix appearance in error pagesLuis Alonso Chavez Armendariz2016-11-2912-42/+129
| | |
* | | Merge branch '25044-md-header-tabs' into 'master' Annabel Dunstone Gray2016-11-301-7/+0
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 25044 Make md header tabs match nav tabs ## What does this MR do? Changes styling of md-header tabs to match navigation tabs ## Screenshots (if relevant) ## 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 #25044 See merge request !7801
| * | | 25044 Make md header tabs match nav tabs25044-md-header-tabstauriedavis2016-11-291-7/+0
| | | |
* | | | Merge branch '24894-style-system-note-in-commit-discussion' into 'master' Annabel Dunstone Gray2016-11-302-0/+8
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | new system note design for commit discussion ## What does this MR do? This MR implement new system notes design for discussion on a commit. ## Are there points in the code the reviewer needs to double check? NR ## Why was this MR needed? It improves UX and coherent style in UI ## Screenshots (if relevant) **before** ![commit-discussion-before](/uploads/b68ab7cce583a18ac066691448f955e7/commit-discussion-before.png) **After** ![commit-discussion-after](/uploads/e9c0cb48c29fdd9b6de6f23a3c588d03/commit-discussion-after.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 - [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 #24894 See merge request !7721
| * | | | removes redundant styles24894-style-system-note-in-commit-discussionNur Rony2016-11-301-116/+0
| | | | |
| * | | | changelog entry addedNur Rony2016-11-301-0/+4
| | | | |
| * | | | new system note design for commit discussionNur Rony2016-11-301-0/+120
| | |_|/ | |/| |
* | | | Merge branch '24844-environments-date' into 'master' Fatih Acet2016-11-303-4/+34
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Environments displaying incorrect date since 8.14 upgrade" ## What does this MR do? Shows the correct date in the environments table. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? Date shown was not the correct one. ## Screenshots (if relevant) ## 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 - [x] 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 #24844 See merge request !7830
| * | | | Fix comma-dangle in function's arguments errors24844-environments-dateFilipa Lacerda2016-11-302-3/+3
| | | | |
| * | | | Improvements after reviewFilipa Lacerda2016-11-301-4/+10
| | | | |
| * | | | Use created date from last_deploymentFilipa Lacerda2016-11-303-2/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds test Adds changelog entry
* | | | | Merge branch 'api-branch-status' into 'master' Rémy Coutable2016-11-304-1/+25
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | API: Expose branch status Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/24938 See merge request !7796
| * | | | | API: Expose branch statusapi-branch-statusRobert Schilling2016-11-304-1/+25
| | | | | |
* | | | | | Merge branch 'revert-rufus-scheduler-bump' into 'master' Stan Hu2016-11-301-2/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert bump in rufus-scheduler Somehow `bundle install` with an update to Sidekiq-cron in !7815 caused rufus-scheduler to be bumped, when it doesn't appear absolutely necessary. Closes #25160 See merge request !7844
| * | | | | | Revert bump in rufus-schedulerrevert-rufus-scheduler-bumpStan Hu2016-11-301-2/+1
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Somehow `bundle install` with an update to Sidekiq-cron caused rufus-scheduler to be bumped, when it doesn't appear absolutely necessary. Closes #25160
* | | | | | Merge branch 'dont-run-ee_compat_check-on-dev' into 'master' Sean McGivern2016-11-301-1/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disable the `ee_compat_check` task on dev See merge request !7847
| * | | | | | Disable the ee_compat_check task on devRémy Coutable2016-11-301-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We usually use it for security fixes that don't need to be ported to EE and the task seems to hang when run against the security branch. Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | Merge branch 'fix-migrations' into 'master' Sean McGivern2016-11-3022-3/+47
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | Make the `downtime_check` task happy See merge request !7845
| * | | | | | Make the downtime_check task happyfix-migrationsRémy Coutable2016-11-3022-3/+47
|/ / / / / / | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | Merge branch 'grapify-files-api' into 'master' Rémy Coutable2016-11-302-95/+62
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Grapify the files API Related to https://gitlab.com/gitlab-org/gitlab-ce/issues/22928 See merge request !7806
| * | | | | Grapify the files APIgrapify-files-apiRobert Schilling2016-11-302-95/+62
| |/ / / /
* | | | | Merge branch 'grapify-projects-api' into 'master' Rémy Coutable2016-11-304-358/+288
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Grapify the projects API Related to #22928 See merge request !7456
| * | | | | Grapify the projects APIgrapify-projects-apiRobert Schilling2016-11-284-358/+288
| | | | | |
* | | | | | Merge branch '25031-do-not-raise-error-in-autocomplete' into 'master' Rémy Coutable2016-11-303-1/+14
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not raise error in AutocompleteController#users when not authorized Closes #25031 See merge request !7817
| * | | | | | Do not raise error in AutocompleteController#users when not authorizedSemyon Pupkov2016-11-303-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/issues/25031
* | | | | | | Merge branch 'rs-group-security-spec-speed' into 'master' Rémy Coutable2016-11-304-219/+181
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Speed up Group security access specs This is the Group equivalent of 13ad9a745a392e0bf0cedd0e1f318c1acee9b969 See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7779 Part of https://gitlab.com/gitlab-org/gitlab-ce/issues/24899 See merge request !7813
| * | | | | | | Speed up Group security access specsrs-group-security-spec-speedRobert Speicher2016-11-304-219/+181
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is the Group equivalent of 13ad9a745a392e0bf0cedd0e1f318c1acee9b969
* | | | | | | | Merge branch 'fix/create-pipeline-with-builds-in-transaction' into 'master' Kamil Trzciński2016-11-305-95/+108
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create pipeline along with builds in the transation ## What does this MR do? This MR makes it possible to create pipeline along with all associated builds in the transaction, to avoid having empty pipelines when asynchronous job gets terminated. This will simplify implementation of `PipelineUnlockWorker` in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6988 and improve reliability of the CI as a whole. ## What are the relevant issue numbers? Related to #24361 See merge request !7742
| * | | | | | | | Extend pipelines factory with transient config attributefix/create-pipeline-with-builds-in-transactionGrzegorz Bizon2016-11-272-14/+9
| | | | | | | | |
| * | | | | | | | Improve readability in pipeline test objects factoryGrzegorz Bizon2016-11-251-6/+10
| | | | | | | | |
| * | | | | | | | Remove pipeline factory that is not used in testsGrzegorz Bizon2016-11-251-6/+0
| | | | | | | | |
| * | | | | | | | Restore method that ensures builds being createdGrzegorz Bizon2016-11-253-21/+52
| | | | | | | | |
| * | | | | | | | Add Changelog entry for pipeline creation improvementsGrzegorz Bizon2016-11-251-0/+4
| | | | | | | | |
| * | | | | | | | Remove remaining calls to CI yaml in pipeline specsGrzegorz Bizon2016-11-251-5/+0
| | | | | | | | |
| * | | | | | | | Move helpers to the end of process pipeline specsGrzegorz Bizon2016-11-251-29/+29
| | | | | | | | |
| * | | | | | | | Update pipeline processing specs for creating buildsGrzegorz Bizon2016-11-251-35/+28
| | | | | | | | |
| * | | | | | | | Create pipeline along with builds in the transationGrzegorz Bizon2016-11-242-12/+9
| | | | | | | | |
* | | | | | | | | Merge branch 'fix/rename-merge-request-head-pipeline' into 'master' Kamil Trzciński2016-11-3012-39/+56
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename `MergeRequest#pipeline` to `head_pipeline` ## What does this MR do? This MR renames `MergeRequest#pipeline` to `MergeRequest#head_pipeline` ## Does this MR meet the acceptance criteria? - [x] All builds are passing ## What are the relevant issue numbers? Closes #24810 See merge request !7783
| * | | | | | | | | Rename `MergeRequest#pipeline` to `head_pipeline`fix/rename-merge-request-head-pipelineGrzegorz Bizon2016-11-2912-39/+56
| | | | | | | | | |
* | | | | | | | | | Merge branch 'patch-1' into 'master' Sean McGivern2016-11-301-1/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rewrite an HTTP link to use HTTPS See merge request !7834
| * | | | | | | | | | Rewrite an HTTP link to use HTTPSAlex Jordan2016-11-291-1/+1
| | |_|_|_|_|_|_|/ / | |/| | | | | | | |