summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Update changelog with MR idsiemens/gitlab-ce-fix/subgroup-hide-buttonDmitriy Zaporozhets2017-04-111-1/+1
* Move permission to create subgroup into GroupPolicyDmitriy Zaporozhets2017-04-116-28/+8
* fix(subgroups): add verification of group creation capability to subgroup UIFabio Huser2017-03-303-1/+27
* Merge branch 'fix-ee_compat_check' into 'master' Sean McGivern2017-03-281-2/+2
|\
| * Fix Gitlab::EeCompatCheck: use `ee_branch_found` instead of `ee_branch`Rémy Coutable2017-03-281-2/+2
* | Merge branch 'rs-empty-project-services' into 'master' Rémy Coutable2017-03-2855-119/+143
|\ \
| * | Use `:empty_project` where possible in service specsRobert Speicher2017-03-2755-119/+143
| |/
* | Merge branch '23363-use-strong-params-in-wikis-controller' into 'master' Rémy Coutable2017-03-282-1/+5
|\ \ | |/ |/|
| * Update wikis_controller.rb to use strong paramsKeifer Furzland2017-03-252-1/+5
* | Merge branch 'fix-knapsack' into 'master' Robert Speicher2017-03-271-2/+2
|\ \
| * | If wget fails, remove the empty file createdRémy Coutable2017-03-271-2/+2
* | | Merge branch '29973-kebab-case-documentation' into 'master' Alfredo Sumaran2017-03-271-4/+11
|\ \ \
| * | | Adds entry about kebab case props in documentationFilipa Lacerda2017-03-271-4/+11
|/ / /
* | | Merge branch '30112-fix-pipelines-sub-nav-highlight' into 'master' Alfredo Sumaran2017-03-272-2/+6
|\ \ \
| * | | Fix sub-nav highlighting for `Environments` and `Jobs` pagesKushal Pandya2017-03-272-2/+6
|/ / /
* | | Merge branch 'backport-chart-changes' into 'master' Alfredo Sumaran2017-03-271-1/+5
|\ \ \
| * | | spread out webpack bundles per-line to reduce conflicts in EEMike Greiling2017-03-271-1/+5
|/ / /
* | | Merge branch 'update-test-bundle-ignored-files' into 'master' Alfredo Sumaran2017-03-272-0/+23
|\ \ \
| * | | update test_bundle.js ignored filesJose Ivan Vargas2017-03-242-0/+23
* | | | Merge branch 'uxguide-tooltips' into 'master' Annabel Dunstone Gray2017-03-271-2/+12
|\ \ \ \
| * | | | Improve UX guide on tooltipsPedro Moreira da Silva2017-03-271-2/+12
* | | | | Merge branch 'rename_done_to_closed' into 'master' Sean McGivern2017-03-2726-62/+66
|\ \ \ \ \
| * | | | | Change Done column to Closed in issue boardsblackst0ne2017-03-2426-62/+66
* | | | | | Merge branch 'patch-16' into 'master' Sean McGivern2017-03-271-1/+1
|\ \ \ \ \ \
| * | | | | | Correct example value variable name. Johan Brandhorst2017-03-271-1/+1
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'sh-bring-back-option-to-be-notified-of-own-activity' into 'mast...Robert Speicher2017-03-2712-6/+165
|\ \ \ \ \ \
| * | | | | | Simplify migrationStan Hu2017-03-241-5/+1
| * | | | | | Simplify specStan Hu2017-03-241-1/+1
| * | | | | | Update CHANGELOG entryStan Hu2017-03-241-1/+1
| * | | | | | Use default_value_for to set notified_of_own_activity instead of using a DB m...Stan Hu2017-03-243-21/+2
| * | | | | | Merge branch 'master' into sh-bring-back-option-to-be-notified-of-own-activityStan Hu2017-03-24720-3947/+6473
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| * | | | | | Merge branch 'master' into sh-bring-back-option-to-be-notified-of-own-activityStan Hu2017-03-20149-1269/+1289
| |\ \ \ \ \ \
| * | | | | | | Fix changes that were removed when code moved to NotificationReceipientServiceStan Hu2017-03-171-3/+3
| * | | | | | | Merge branch 'master' into sh-bring-back-option-to-be-notified-of-own-activityStan Hu2017-03-17112-1877/+2892
| |\ \ \ \ \ \ \
| * | | | | | | | Add separate post migration to change default of notified_of_own_activityStan Hu2017-03-173-2/+22
| * | | | | | | | Remove original migration and re-add required migration under a later timestampsh-bring-back-option-to-be-notified-of-own-activityStan Hu2017-03-162-3/+3
| * | | | | | | | Revert "Merge branch '8836-mr-revert' into 'master'Stan Hu2017-03-1610-6/+168
* | | | | | | | | Merge branch 'patch-15' into 'master' Rémy Coutable2017-03-271-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Use same variable for registry password as aboveNiklas2017-03-251-1/+1
* | | | | | | | | | Merge branch 'unused-sidebar-styles' into 'master' Annabel Dunstone Gray2017-03-273-38/+0
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | remove some unused sidebar stylesSimon Knox2017-03-243-38/+0
* | | | | | | | | | | Merge branch 'mr-diffs-speed-up' into 'master' Rémy Coutable2017-03-272-22/+26
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Only load what we need when visiting MR diffs pageSean McGivern2017-03-272-22/+26
* | | | | | | | | | | | Merge branch '29787-monitor-ee-rspec-tests-separately' into 'master' Sean McGivern2017-03-272-2/+7
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | |
| * | | | | | | | | | | When on CI, enable RSpec profiling for `master` onlyRémy Coutable2017-03-241-1/+2
| * | | | | | | | | | | RSpec profiling: Prepend the branch name with `ce` or `ee`Rémy Coutable2017-03-241-1/+5
* | | | | | | | | | | | Merge branch 'triggers-docs' into 'master' Achilleas Pipinellis2017-03-273-8/+26
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Update triggers documentationKamil Trzcinski2017-03-173-8/+26
* | | | | | | | | | | | | Merge branch 'issue-boards-test-fix' into 'master' Filipa Lacerda2017-03-273-16/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Fixed up issue boards JS specsPhil Hughes2017-03-273-16/+16
View Lorry Controller Status