Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Added specs for board list componentissue-boards-list-template-in-js | Phil Hughes | 2017-03-28 | 3 | -6/+210 |
* | Issue boards list template in JS file | Phil Hughes | 2017-03-28 | 5 | -138/+175 |
* | Merge branch 'fix-ee_compat_check' into 'master' | Sean McGivern | 2017-03-28 | 1 | -2/+2 |
|\ | |||||
| * | Fix Gitlab::EeCompatCheck: use `ee_branch_found` instead of `ee_branch` | Rémy Coutable | 2017-03-28 | 1 | -2/+2 |
* | | Merge branch 'rs-empty-project-services' into 'master' | Rémy Coutable | 2017-03-28 | 55 | -119/+143 |
|\ \ | |||||
| * | | Use `:empty_project` where possible in service specs | Robert Speicher | 2017-03-27 | 55 | -119/+143 |
| |/ | |||||
* | | Merge branch '23363-use-strong-params-in-wikis-controller' into 'master' | Rémy Coutable | 2017-03-28 | 2 | -1/+5 |
|\ \ | |/ |/| | |||||
| * | Update wikis_controller.rb to use strong params | Keifer Furzland | 2017-03-25 | 2 | -1/+5 |
* | | Merge branch 'fix-knapsack' into 'master' | Robert Speicher | 2017-03-27 | 1 | -2/+2 |
|\ \ | |||||
| * | | If wget fails, remove the empty file created | Rémy Coutable | 2017-03-27 | 1 | -2/+2 |
* | | | Merge branch '29973-kebab-case-documentation' into 'master' | Alfredo Sumaran | 2017-03-27 | 1 | -4/+11 |
|\ \ \ | |||||
| * | | | Adds entry about kebab case props in documentation | Filipa Lacerda | 2017-03-27 | 1 | -4/+11 |
|/ / / | |||||
* | | | Merge branch '30112-fix-pipelines-sub-nav-highlight' into 'master' | Alfredo Sumaran | 2017-03-27 | 2 | -2/+6 |
|\ \ \ | |||||
| * | | | Fix sub-nav highlighting for `Environments` and `Jobs` pages | Kushal Pandya | 2017-03-27 | 2 | -2/+6 |
|/ / / | |||||
* | | | Merge branch 'backport-chart-changes' into 'master' | Alfredo Sumaran | 2017-03-27 | 1 | -1/+5 |
|\ \ \ | |||||
| * | | | spread out webpack bundles per-line to reduce conflicts in EE | Mike Greiling | 2017-03-27 | 1 | -1/+5 |
|/ / / | |||||
* | | | Merge branch 'update-test-bundle-ignored-files' into 'master' | Alfredo Sumaran | 2017-03-27 | 2 | -0/+23 |
|\ \ \ | |||||
| * | | | update test_bundle.js ignored files | Jose Ivan Vargas | 2017-03-24 | 2 | -0/+23 |
* | | | | Merge branch 'uxguide-tooltips' into 'master' | Annabel Dunstone Gray | 2017-03-27 | 1 | -2/+12 |
|\ \ \ \ | |||||
| * | | | | Improve UX guide on tooltips | Pedro Moreira da Silva | 2017-03-27 | 1 | -2/+12 |
* | | | | | Merge branch 'rename_done_to_closed' into 'master' | Sean McGivern | 2017-03-27 | 26 | -62/+66 |
|\ \ \ \ \ | |||||
| * | | | | | Change Done column to Closed in issue boards | blackst0ne | 2017-03-24 | 26 | -62/+66 |
* | | | | | | Merge branch 'patch-16' into 'master' | Sean McGivern | 2017-03-27 | 1 | -1/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Correct example value variable name. | Johan Brandhorst | 2017-03-27 | 1 | -1/+1 |
| | |_|_|/ / | |/| | | | | |||||
* | | | | | | Merge branch 'sh-bring-back-option-to-be-notified-of-own-activity' into 'mast... | Robert Speicher | 2017-03-27 | 12 | -6/+165 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Simplify migration | Stan Hu | 2017-03-24 | 1 | -5/+1 |
| * | | | | | | Simplify spec | Stan Hu | 2017-03-24 | 1 | -1/+1 |
| * | | | | | | Update CHANGELOG entry | Stan Hu | 2017-03-24 | 1 | -1/+1 |
| * | | | | | | Use default_value_for to set notified_of_own_activity instead of using a DB m... | Stan Hu | 2017-03-24 | 3 | -21/+2 |
| * | | | | | | Merge branch 'master' into sh-bring-back-option-to-be-notified-of-own-activity | Stan Hu | 2017-03-24 | 720 | -3947/+6473 |
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | | | |||||
| * | | | | | | Merge branch 'master' into sh-bring-back-option-to-be-notified-of-own-activity | Stan Hu | 2017-03-20 | 149 | -1269/+1289 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | Fix changes that were removed when code moved to NotificationReceipientService | Stan Hu | 2017-03-17 | 1 | -3/+3 |
| * | | | | | | | Merge branch 'master' into sh-bring-back-option-to-be-notified-of-own-activity | Stan Hu | 2017-03-17 | 112 | -1877/+2892 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | Add separate post migration to change default of notified_of_own_activity | Stan Hu | 2017-03-17 | 3 | -2/+22 |
| * | | | | | | | | Remove original migration and re-add required migration under a later timestampsh-bring-back-option-to-be-notified-of-own-activity | Stan Hu | 2017-03-16 | 2 | -3/+3 |
| * | | | | | | | | Revert "Merge branch '8836-mr-revert' into 'master' | Stan Hu | 2017-03-16 | 10 | -6/+168 |
* | | | | | | | | | Merge branch 'patch-15' into 'master' | Rémy Coutable | 2017-03-27 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Use same variable for registry password as above | Niklas | 2017-03-25 | 1 | -1/+1 |
* | | | | | | | | | | Merge branch 'unused-sidebar-styles' into 'master' | Annabel Dunstone Gray | 2017-03-27 | 3 | -38/+0 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | remove some unused sidebar styles | Simon Knox | 2017-03-24 | 3 | -38/+0 |
* | | | | | | | | | | | Merge branch 'mr-diffs-speed-up' into 'master' | Rémy Coutable | 2017-03-27 | 2 | -22/+26 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Only load what we need when visiting MR diffs page | Sean McGivern | 2017-03-27 | 2 | -22/+26 |
* | | | | | | | | | | | | Merge branch '29787-monitor-ee-rspec-tests-separately' into 'master' | Sean McGivern | 2017-03-27 | 2 | -2/+7 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | When on CI, enable RSpec profiling for `master` only | Rémy Coutable | 2017-03-24 | 1 | -1/+2 |
| * | | | | | | | | | | | RSpec profiling: Prepend the branch name with `ce` or `ee` | Rémy Coutable | 2017-03-24 | 1 | -1/+5 |
* | | | | | | | | | | | | Merge branch 'triggers-docs' into 'master' | Achilleas Pipinellis | 2017-03-27 | 3 | -8/+26 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | Update triggers documentation | Kamil Trzcinski | 2017-03-17 | 3 | -8/+26 |
* | | | | | | | | | | | | | Merge branch 'issue-boards-test-fix' into 'master' | Filipa Lacerda | 2017-03-27 | 3 | -16/+16 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | Fixed up issue boards JS specs | Phil Hughes | 2017-03-27 | 3 | -16/+16 |
* | | | | | | | | | | | | | | Merge branch '12818-expose-simple-cicd-status-endpoints-with-status-serialize... | Kamil Trzciński | 2017-03-27 | 37 | -13/+302 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ |