summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Mattermost Notifications ServiceFelipe Artur2016-12-1533-524/+658
|
* Merge branch 'gitlab-workhorse-multipart' into 'master' Sean McGivern2016-12-1520-35/+295
|\ | | | | | | | | Replace Rack::Multipart with gitlab-workhorse based system See merge request !5867
| * Add Gitlab::Middleware::MultipartJacob Vosmaer2016-12-1520-35/+295
| |
* | Merge branch 'seed-runner-token' into 'master' Kamil Trzciński2016-12-156-11/+60
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow users to seed the initial runner registration token using an environment variable ## What does this MR do? Allow users to seed the initial runner registration token using an environment variable ## Are there points in the code the reviewer needs to double check? - Naming, do we want to make sure we are clear it's the 'registration' token. Like GITLAB_RUNNER_REGISTRATION_TOKEN vs what I have now, GITLAB_RUNNER_TOKEN - Not sure we've tested a seed fixture before, I just made up a directory structure for the test ## Why was this MR needed? At the moment I want to use this in our idea to production demo: https://gitlab.com/gitlab-org/gitlab-ce/issues/22190 This is useful for when runner is bundled with gitlab, like in a kubernetes stack, and we want the runner to be able to register with gitlab as soon as they both come up. ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [x] [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 - [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 you do - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !6642
| * Add changelog entry for seeding the runner request tokenseed-runner-tokenDJ Mountney2016-12-011-0/+5
| |
| * Allow users to seed the initial runner registration token using an ↵DJ Mountney2016-12-015-11/+55
| | | | | | | | | | | | | | environment variable This is useful for when runner is bundled with gitlab, like in a kubernetes stack, and we want the runner to be able to register with gitlab as soon as they both come up.
* | Merge branch 'fix-slack-pipeline-message-by-api' into 'master' Kamil Trzciński2016-12-153-10/+26
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Slack pipeline message by API Pipelines triggered from API don't have a corresponding user, so we show that it's from API, same as from the web UI Closes #25609 See merge request !8059
| * | Fix Slack pipeline message by APIfix-slack-pipeline-message-by-apiLin Jen-Shin2016-12-133-10/+26
| | | | | | | | | | | | | | | | | | | | | | | | Pipelines triggered from API don't have a corresponding user, so we show that it's from API, same as from the web UI Closes #25609
* | | Merge branch '22849-ci-build-ref-slug' into 'master' Kamil Trzciński2016-12-156-27/+62
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduce $CI_BUILD_REF_SLUG ## What does this MR do? Adds `$CI_BUILD_REF_SLUG` to the variables exposed to the runner. This is based on `$CI_BUILD_REF_NAME` but lowercased, shortened to 63 bytes maximum, and with characters invalid in URLs and domain names replaced with `-`. ## Are there points in the code the reviewer needs to double check? Slugs don't have a uniqueness guarantee. !7983 introduces an environment name slug which *is* unique, so I'm not as exercised about this as I was. Should the slug be published in the API? It's available through the `variables` endpoint, but perhaps it should be part of `GET /project/:id/builds` ? I've called it `ref_slug` rather than just `slug` as there are number of possibilities for slugification in a build (unlike an environment, where only the name makes sense to slugify). ## Why was this MR needed? `$CI_BUILD_REF_NAME` is not suited for URLs and domain names, given the list of valid characters in a git ref. ## Screenshots (if relevant) ## 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) - [ ] API support added - Tests - [X] 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) - [X] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #22849 See merge request !8072
| * | | Introduce $CI_BUILD_REF_SLUGNick Thomas2016-12-136-27/+62
| | | |
* | | | Merge branch 'fix/transient-failing-analytics-spec' into 'master' James Lopez2016-12-151-0/+8
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix transient failure on AnalyticsBuildEntity AnalyticsBuildEntity uses `Time.now` to calculate durations, and on slow running builds could fail this spec. Mocking with `Timecop` should be sufficient to fix this. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/25500 See merge request !8082
| * | | | fix transient timing failure adding timecopfix/transient-failing-analytics-specJames Lopez2016-12-141-0/+8
| | | | |
* | | | | Merge branch 'delete-more-page-specific-css' into 'master' Jacob Schatz2016-12-1510-40/+14
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Delete more page specific css * Moves emojis and icons into `framework` * Comments out unused bootstrap imports (we can remove them entirely later) See merge request !7961
| * | | | | Remove pages/snippets cssdelete-more-page-specific-cssAnnabel Dunstone Gray2016-12-147-31/+11
| | | | | |
| * | | | | Remove unused bootstrap importsAnnabel Dunstone Gray2016-12-141-5/+5
| | | | | |
| * | | | | Shift emojis and icons styles into frameworkAnnabel Dunstone Gray2016-12-145-10/+4
|/ / / / /
* | | | | Merge branch 'clean-no-undef' into 'master' Alfredo Sumaran2016-12-15171-214/+611
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Explicitly declare all javascript globals and all eslint rule violations This merge request takes every single external global variable referenced within a javascript file and explicitly marks it with a `/* global Foo */` comment block at the top of the script. This also expands all blanket instances of `/* eslint-disable */` with an explicit list of disabled rules. This is useful because if we need to search for violations of a particular rule we can simply grep the codebase for something like `no-unused-vars` or `semi` and find all of the places where this rule has yet to be fixed. Lastly, it also removes and resolves any existing `no-undef` eslint violations. This is useful for catching mistakes like forgetting to declare a variable with `var`/`let`/`const` which can cause hard to find bugs. ## What does this MR do? 1. Looks for generic uses of `/* eslint-disable */` and refactors them into individual rule exceptions. 2. Looks for all occurrences of `/* eslint-disable ... no-undef */` and resolves them by either fixing bugs or declaring globals with `/* global Foo */`. ## Are there points in the code the reviewer needs to double check? This touches a lot of files, most changes touch nothing other than comment blocks or whitespace. The exceptions are the following 14 files which required some small bug fixes after removing `no-undef`: - api.js - breakpoints.js - build.js - commits.js - diff_notes/components/jump_to_discussion.js.es6 - gfm_auto_complete.js.es6 - gl_dropdown.js - groups_select.js - importer_status.js - namespace_select.js - notes.js - preview_markdown.js - projects_list.js - single_file_diff.js ## Why was this MR needed? Removal of ~"technical debt" and some necessary changes to help !7288 ## Screenshots (if relevant) N/A ## 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 - [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? N/A See merge request !8043
| * | | | | resolve all instances of no-undef eslint rule violationsclean-no-undefMike Greiling2016-12-1488-111/+295
| | | | | |
| * | | | | expand remaining non-explicit eslint-disable blocks and factor out globals ↵Mike Greiling2016-12-1387-107/+320
| | | | | | | | | | | | | | | | | | | | | | | | when no-undef encountered
* | | | | | Merge branch 'username-exists-root' into 'master' Alfredo Sumaran2016-12-142-1/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Username exists check respects the relative root URL ## What does this MR do? The path for checking if the username exists was hardcoded to as a absolute URL which broke in relative path installs. This fixes that by respecting the relative path. ## What are the relevant issue numbers? Closes #25548 See merge request !8092
| * | | | | | Username exists check respects the relative root URLusername-exists-rootPhil Hughes2016-12-142-1/+5
| | |/ / / / | |/| | | | | | | | | | | | | | | | Closes #25548
* | | | | | Merge branch 'variables' into 'master' Jacob Schatz2016-12-1448-225/+175
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removing and combining sass variables * Removes/combines a good portion of our many shades of gray, according to https://gitlab.com/gitlab-org/gitlab-ce/uploads/207006b0aeadee57499c891f173198f4/Shades_of_grey_-_combined.png * Renaming variables according to saturation etc will be in separate MR See merge request !8052
| * | | | | | Finish refactoring graysvariablesAnnabel Dunstone Gray2016-12-1340-135/+110
| | | | | | |
| * | | | | | Combining more graysAnnabel Dunstone Gray2016-12-1315-48/+29
| | | | | | |
| * | | | | | Remove duplicate shades of gray and blackAnnabel Dunstone Gray2016-12-1318-44/+38
| | |_|/ / / | |/| | | |
* | | | | | Merge branch '22864-kubernetes-service' into 'master' Kamil Trzciński2016-12-1416-1/+384
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduce deployment services, starting with a KubernetesService ## What does this MR do? Adds a minimal `KubernetesService` and introduces the idea of deployment services, generally. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? Two issues scheduled for 8.15 both require a Kubernetes service - #22864 and #23580 - but they use it for very different things. Add a minimal kubernetes service to avoid conflicts later. ## Screenshots ![Screen_Shot_2016-12-14_at_12.44.13](/uploads/77d38baf2a196118f0cf7e2b996a65f3/Screen_Shot_2016-12-14_at_12.44.13.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] 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) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #22985 See merge request !7994
| * | | | | | Introduce deployment services, starting with a KubernetesServiceNick Thomas2016-12-1416-1/+384
| | | | | | |
* | | | | | | Merge branch 'dont-lint-npm-modules' into 'master' Alfredo Sumaran2016-12-141-0/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add node_modules to our eslintignore settings ## What does this MR do? Adds `/node_modules` directory to `.eslintignore` so we don't lint npm modules in our build process. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? ## 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 - [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 #25690 See merge request !8089
| * | | | | | | add node_modules to our eslintignore settingsdont-lint-npm-modulesMike Greiling2016-12-141-0/+1
| | | | | | | |
* | | | | | | | Merge branch 'fix-navigation-white-space' into 'master' Annabel Dunstone Gray2016-12-148-23/+22
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove white space between nav items Fixes annoying white space between items on navigation bars. Before ![Screen_Shot_2016-12-13_at_6.06.11_PM](/uploads/605b49822f93168901bedc5ceb6490a3/Screen_Shot_2016-12-13_at_6.06.11_PM.png) After ![Screen_Shot_2016-12-13_at_6.06.22_PM](/uploads/5c2e6432be477deaaf544cf81ec493e9/Screen_Shot_2016-12-13_at_6.06.22_PM.png) See merge request !8078
| * | | | | | | | Remove white space between nav itemsfix-navigation-white-spaceAlfredo Sumaran2016-12-148-23/+22
| | | | | | | | |
* | | | | | | | | Merge branch '24803-change-cursor-for-ca-stages' into 'master' Alfredo Sumaran2016-12-142-0/+6
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cursor now changes to a pointer when mousing over stages on Cycle Analytics page When mousing over the different stage headers on the Cycle Analytics page, the mouse cursor will now change to a pointer, indicating these sections are clickable. Closes #24803 cc: @awhildy See merge request !7921
| * | | | | | | | | Change cursor type only for inactive stage-nav-items on Cycle Analytics pageRyan Harris2016-12-091-1/+2
| | | | | | | | | |
| * | | | | | | | | Changed cursor for stage-nav-item instead of just stage-nameRyan Harris2016-12-051-2/+1
| | | | | | | | | |
| * | | | | | | | | Cursor now changes to a pointer when mousing over stages on Cycle Analytics pageRyan Harris2016-12-042-0/+6
| | | | | | | | | |
* | | | | | | | | | Merge branch '24927-custom-event-polyfill-test' into 'master' Alfredo Sumaran2016-12-142-0/+47
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds tests for Custom Event polyfill ## What does this MR do? Adds tests for CustomEvent polyfill. ## 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 - [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 #24927 See merge request !7996
| * | | | | | | | | Fix broken test in chrome24927-custom-event-polyfill-testFilipa Lacerda2016-12-131-3/+3
| | | | | | | | | |
| * | | | | | | | | Fix broken testFilipa Lacerda2016-12-091-3/+3
| | | | | | | | | |
| * | | | | | | | | Adds tests for Custom Event polyfillFilipa Lacerda2016-12-082-0/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update changelog with MR ID
* | | | | | | | | | Merge branch 'dz-remove-namespaces-path-uniq' into 'master' Dmitriy Zaporozhets2016-12-148-12/+118
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Modify namespace name and path validation ## What does this MR do? * Allow same namespace name with different parent_id * Allow same namespace path. Uniq validation should be handled by routes table ## Are there points in the code the reviewer needs to double check? migrations ## Why was this MR needed? So we can use same name in different nesting like: ``` gitlab-ce/foo gitlab-com/foo foo/gitlab-ce ``` ## Screenshots (if relevant) no ## 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 - [x] 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) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? https://gitlab.com/gitlab-org/gitlab-ce/issues/2772 See merge request !8013
| * | | | | | | | | Merge branch 'master' into 'dz-remove-namespaces-path-uniq'Dmitriy Zaporozhets2016-12-14217-893/+3737
| |\ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge Request - https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/8013 # Conflicts: # db/schema.rb
* | | | | | | | | | Merge branch 'dz-fix-admin-routes' into 'master' Sean McGivern2016-12-1413-27/+48
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for nested groups to admin routing See merge request !8008
| * | | | | | | | | Add support for nested groups to admin routingdz-fix-admin-routesDmitriy Zaporozhets2016-12-1113-27/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | | | | Merge branch 'mattl-gitshell-fixes' into 'master' Rémy Coutable2016-12-141-1/+1
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updates the docs to require GitLab Shell 4.0.3 See merge request !8050
| * | | | | | | | | Merge branch 'cherry-pick-f55fc1ec' into 'mattl-gitshell-fixes' mattl-gitshell-fixesMatt Lee2016-12-121-1/+1
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8.14 requires GitLab shell 4.0.3 ## What does this MR do? ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? ## Screenshots (if relevant) ## Does this MR meet the acceptance criteria? - [ ] [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) - [ ] 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? See merge request !8049
| | * | | | | | | | | 8.14 requires GitLab shell 4.0.3Matt Lee2016-12-121-1/+1
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'build-statuses' into 'master' Rémy Coutable2016-12-1458-170/+1125
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Detailed build statuses ## What does this MR do? Implements detailed statuses for `Ci::Builds` and `CommitStatus`. It also adds a new icon for manual build. ## Screenshots ![manual_builds_icon](/uploads/22b5c594350856c85398ef705a635f8b/manual_builds_icon.png) ## What are the relevant issue numbers? See #24273, closes #22642 See merge request !7989
| * | | | | | | | | | Improve build status specs contexts descriptionsGrzegorz Bizon2016-12-145-4/+6
| | | | | | | | | | |
| * | | | | | | | | | Add some missing tests for detailed status methodsbuild-statusesGrzegorz Bizon2016-12-143-2/+32
| | | | | | | | | | |
| * | | | | | | | | | Remove trailing blank line from Allowable moduleGrzegorz Bizon2016-12-141-1/+0
| | | | | | | | | | |