summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Change doc location of custom hooksdoc-custom-githook-uiAchilleas Pipinellis2016-07-054-55/+58
|
* Follow doc styleguideAchilleas Pipinellis2016-07-052-18/+20
|
* Add documentation for custom Git hook error message in GitLab's UIAchilleas Pipinellis2016-07-051-0/+13
|
* Merge branch 'mrchrisw/docs/shibboleth' into 'master' Achilleas Pipinellis2016-07-051-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | Fix wording around NGINX Shibboleth setup ![image](/uploads/de69ad7a056083ab4ca337d9cacad6e2/image.png) __________ ![image](/uploads/bd8081aa0e3a7bd0568267c4a485df5d/image.png) See merge request !5034
| * Fix wording around NGINX Shibboleth setupmrchrisw/docs/shibbolethChris Wilson2016-07-011-1/+1
| |
* | Merge branch 'doc-mysql-priv' into 'master' Achilleas Pipinellis2016-07-052-5/+21
|\ \ | | | | | | | | | | | | | | | | | | Add missing privileges to MySQL database Closes gitlab-org/gitlab-ce#19321 See merge request !5079
| * | Add missing privileges to MySQL databaseAchilleas Pipinellis2016-07-052-5/+21
| | | | | | | | | | | | [ci skip]
* | | Merge branch 'index-on-emoji-name-and-user' into 'master' Yorick Peterse2016-07-053-1/+14
|\ \ \ | | | | | | | | | | | | | | | | Add index on both Award Emoji user and name See merge request !5061
| * | | Add index on both Award Emoji user and nameindex-on-emoji-name-and-userZ.J. van de Weg2016-07-053-1/+14
| |/ /
* | | Merge branch 'refactor/ci-config-move-global-entries' into 'master' Rémy Coutable2016-07-0536-275/+1021
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move global ci entries handling from legacy to new config ## What does this MR do? This MR moves responsibility of handling global CI config entries (like `image`, `services`), from legacy `GitlabCiYamlProcessor` to new CI Config ## Why was this MR needed? This is the next iteration of CI configuration refactoring ## What are the relevant issue numbers? #15060 ## Does this MR meet the acceptance criteria? - Tests - [x] Added for this feature/bug - [x] All builds are passing - [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 you do - rebase it please) See merge request !4820
| * | Add minor improvements in readability in CI configrefactor/ci-config-move-global-entriesGrzegorz Bizon2016-07-046-8/+6
| | |
| * | Extract CI configuration entry node factory methodGrzegorz Bizon2016-07-041-8/+12
| | |
| * | Improve description of CI types node and in specsGrzegorz Bizon2016-06-302-3/+3
| | |
| * | Explicitly define entry node class in new CI configGrzegorz Bizon2016-06-292-11/+11
| | |
| * | Add CI config entry validator for allowed keysGrzegorz Bizon2016-06-294-18/+17
| | |
| * | Return compound value if CI config node is compositeGrzegorz Bizon2016-06-291-1/+6
| | |
| * | Move global CI cache configuration to new CI classesGrzegorz Bizon2016-06-292-29/+3
| | |
| * | Add global cache config entry to new CI configGrzegorz Bizon2016-06-2916-36/+64
| | |
| * | Add CI config entry location info to error messageGrzegorz Bizon2016-06-294-14/+15
| | | | | | | | | | | | This CI config entry location in configuration Hash.
| * | Make it possible to set parent in CI config nodeGrzegorz Bizon2016-06-293-5/+18
| | |
| * | Merge branch 'master' into refactor/ci-config-move-global-entriesGrzegorz Bizon2016-06-28552-3362/+7573
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (352 commits) Display last commit of deleted branch in push events (!4699) add changelog add missing attribute to attr_encrypted so it is fully backwards-compatible Add "GitLab team members only" to diagram link doc: note that .gitattributes uses default branch use the conf lexer so we have highlighted comments first draft of docs support cgi style options, such as erb?parent=json move the path alias to a more appropriate location make #custom_language private appease rubocop add an alias for Snippet#path appease rubocop check the tag so that an instance will pass too fix the spec, using project.change_head Revert "bump the master sha for gitlab-test!9" bump the master sha for gitlab-test!9 add custom highlighting via .gitattributes Rename Licenses API to License Templates API Check for conflict with wiki projects when creating a new project. ...
| * | | Validate interface only with CI node validatorGrzegorz Bizon2016-06-273-40/+24
| | | |
| * | | Add new ci config entry that handles cache configGrzegorz Bizon2016-06-275-12/+151
| | | |
| * | | Add ci config entry that represents array of pathsGrzegorz Bizon2016-06-242-0/+52
| | | |
| * | | Add ci config class that represents a boolean valueGrzegorz Bizon2016-06-243-0/+62
| | | |
| * | | Add ci config class that represents a key valueGrzegorz Bizon2016-06-243-0/+62
| | | |
| * | | Fix ci config cache validation in legacy processorGrzegorz Bizon2016-06-242-3/+16
| | | |
| * | | Minor refactorings in new CI configuration classesGrzegorz Bizon2016-06-235-6/+10
| | | |
| * | | Move CI stages configuration to new CI configGrzegorz Bizon2016-06-2312-29/+147
| | | |
| * | | Assume that unspecified CI config is undefinedGrzegorz Bizon2016-06-238-94/+112
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We assume that when someone adds a key for the configuration entry, but does not provide a valid value, which causes entry to be `nil`, then entry should be considered as the undefined one. We also assume this is semantically correct, this is also backwards compatible with legacy CI config processor. See issue #18775 for more details.
| * | | Return default config value when entry is undefinedGrzegorz Bizon2016-06-229-51/+74
| | | |
| * | | Handle CI environment variables in a new CI configGrzegorz Bizon2016-06-228-9/+115
| | | |
| * | | Rename CI config null node entry to undefined nodeGrzegorz Bizon2016-06-225-23/+16
| | | |
| * | | Return CI entry config as value by defaultGrzegorz Bizon2016-06-214-14/+3
| | | |
| * | | Handle after script CI config in new classesGrzegorz Bizon2016-06-218-24/+24
| | | | | | | | | | | | | | | | | | | | This also makes Script to return an array of commands instead of concatented command, which is our current direction.
| * | | Handle CI services config in new CI config classesGrzegorz Bizon2016-06-217-11/+82
| | | |
| * | | Move CI image configuration entry to new CI configGrzegorz Bizon2016-06-215-21/+34
| | | |
| * | | Add image configuration entry to new ci configGrzegorz Bizon2016-06-212-0/+68
| | | |
| * | | Use generic type validator in new ci configurationGrzegorz Bizon2016-06-213-4/+13
| | | |
* | | | Merge branch '19496-fix-build' into 'master' Stan Hu2016-07-051-2/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Assert against `ActionMailer::Base.deliveries` relatively - Closes #19496 - Fixes `master` build See merge request !5082
| * | | | Assert against `ActionMailer::Base.deliveries` relatively.Timothy Andrew2016-07-051-2/+1
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Look for a `change` in its size rather than asserting against an actual size. - This previously failed because another spec had an email in `ActionMailer::Base.deliveries`, which failed this `be_nil` assertion.
* | | | Merge branch 'diagnosing-mail-issues' into 'master' Achilleas Pipinellis2016-07-041-2/+51
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add troubleshooting section for SMTP settings See merge request !5046
| * | | | Add troubleshooting section for SMTP settingsStan Hu2016-07-011-2/+51
| | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqDmitriy Zaporozhets2016-07-047-9/+65
|\ \ \ \ \
| * \ \ \ \ Merge branch 'master' into dev-masterTomasz Maczukin2016-07-02396-3101/+7106
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (98 commits) Enable Style/EmptyLines cop, remove redundant ones Update CHANGELOG Cache results from jQuery selectors to retrieve namespace name Fix import button when import fail due the namespace already been taken Fix snippets comments not displayed Fix emoji paths in relative root configurations Exclude requesters from Project#members, Group#members and User#members Upgrade Thin from 1.6.1 to 1.7.0. Many squashed commits Cache autocomplete results Upgrade Sidekiq from 4.1.2 to 4.1.4. Upgrade seed-fu from 2.3.5 to 2.3.6 use has_many relationship with events Support creating a todo on issuables via API Expose target, filter by state as string Add todos API documentation and changelog Improve the request / withdraw access button Metrics for Rouge::Plugins::Redcarpet and Rouge::Formatters::HTMLGitlab Groundwork for Kerberos SPNEGO (EE feature) Update CHANGELOG 8.9.5 for runners related fixes ...
| * \ \ \ \ \ Merge branch '18033-private-repo-mentions' into 'master' Douwe Maan2016-06-304-2/+42
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure logged-out users can't see private refs https://gitlab.com/gitlab-org/gitlab-ce/issues/18033 I'm still not sure what to do about the CHANGELOG on security issues - should I add to a patch release? This issue was assigned to 8.10. See merge request !1974
| | * | | | | | Ensure logged-out users can't see private refsSean McGivern2016-06-304-2/+42
| | | | | | | |
| * | | | | | | Merge branch '19312-confidential-issue' into 'master' Douwe Maan2016-06-303-7/+24
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix privilege escalation issue with OAuth external users Related to https://gitlab.com/gitlab-org/gitlab-ce/issues/19312 This MR fixes a privilege escalation issue, where manually set external users would be reverted back to internal users if they logged in via OAuth and that provider was not in the `external_providers` list. /cc @douwe See merge request !1975
| | * | | | | | Fixed privilege escalation issue where manually set external users would be ↵Patricio Cano2016-06-293-7/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | reverted back to internal users if they logged in via OAuth and that provider was not in the `external_providers` list.
* | | | | | | | Merge branch 'user-avatar-header' into 'master' Dmitriy Zaporozhets2016-07-046-20/+42
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added user avatar to header ## What does this MR do? Adds the users avatar to the header with a dropdown for profile & sign out. ## What are the relevant issue numbers? Closes #18543 ## Screenshots (if relevant) ![Screen_Shot_2016-06-27_at_12.47.34](/uploads/852d0eb7075eefcf21f5cf5ff71a389a/Screen_Shot_2016-06-27_at_12.47.34.png) ![Screen_Shot_2016-06-27_at_12.47.36](/uploads/6cb29843d3a12bbf2d3ed2a7c9bde770/Screen_Shot_2016-06-27_at_12.47.36.png) See merge request !4939
View Lorry Controller Status