| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'rs-empty_project' into 'master' 26785-search-bar-doesnt-work-IE | Rémy Coutable | 2017-01-20 | 4 | -131/+125 |
| |\ | | | | | | | | | Use `:empty_project` in Project, User, MergeRequest, and MoveToProjectFinder specs See merge request !8648 | ||||
| | * | Convert MoveToProjectFinder specs to use `:empty_project` | Robert Speicher | 2017-01-19 | 1 | -10/+10 |
| | | | |||||
| | * | Convert most MergeRequest model specs to use `:empty_project` | Robert Speicher | 2017-01-19 | 1 | -22/+22 |
| | | | |||||
| | * | Convert most User model specs to use `:empty_project` | Robert Speicher | 2017-01-19 | 1 | -45/+39 |
| | | | |||||
| | * | Convert most Project model specs to use `:empty_project` | Robert Speicher | 2017-01-19 | 1 | -54/+54 |
| | | | |||||
| * | | Merge branch '26138-combine-webhooks-and-services-settings-pages' into 'master' | Rémy Coutable | 2017-01-20 | 4 | -6/+26 |
| |\ \ | | | | | | | | | | | | | Moved the webhooks and services gear options to a single one called integrations See merge request !8380 | ||||
| | * | | Fixed tests and a rubocop linter26138-combine-webhooks-and-services-settings-pages | Jose Ivan Vargas | 2017-01-18 | 3 | -6/+6 |
| | | | | |||||
| | * | | Corrected code style and titles | Jose Ivan Vargas | 2017-01-18 | 1 | -2/+2 |
| | | | | |||||
| | * | | Fixed more tests | Jose Ivan Vargas | 2017-01-18 | 1 | -1/+1 |
| | | | | |||||
| | * | | Fixed spinach feature tests for the services and hooks controllers | Jose Ivan Vargas | 2017-01-18 | 1 | -0/+20 |
| | | | | | | | | | | | | | Added a test for the integrations controller | ||||
| * | | | Merge branch '21698-redis-runner-last-build' into 'master' | Kamil Trzciński | 2017-01-20 | 4 | -6/+103 |
| |\ \ \ | | | | | | | | | | | | | | | | | Reduce DB-load for build-queues by storing last_update in Redis See merge request !8084 | ||||
| | * | | | Fix specs | Kamil Trzcinski | 2017-01-20 | 1 | -4/+6 |
| | | | | | |||||
| | * | | | Fix specs | Kamil Trzcinski | 2017-01-19 | 1 | -1/+2 |
| | | | | | |||||
| | * | | | Merge remote-tracking branch 'origin/master' into 21698-redis-runner-last-build | Kamil Trzcinski | 2017-01-19 | 91 | -481/+1472 |
| | |\ \ \ | |||||
| | * | | | | Fix specs | Kamil Trzcinski | 2017-01-19 | 1 | -5/+28 |
| | | | | | | |||||
| | * | | | | Add missing build_spec | Kamil Trzcinski | 2017-01-19 | 1 | -0/+10 |
| | | | | | | |||||
| | * | | | | Merge remote-tracking branch 'origin/master' into 21698-redis-runner-last-build | Kamil Trzcinski | 2017-01-19 | 472 | -4328/+22081 |
| | |\ \ \ \ | | | |/ / | | |/| | | |||||
| | * | | | | WIP: Add tests and make sure that headers are set21698-redis-runner-last-build | Lin Jen-Shin | 2017-01-04 | 3 | -2/+73 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * We realized that headers were not set whenever we give 204 because `render_api_error!` doesn't preserve the headers. * We also realized that `update_runner_info` would be called in POST /builds/register every time therefore runner is updated every time, ticking the queue, making this last_update didn't work very well, and the test would be failing due to that. | ||||
| * | | | | | Merge branch '25507-handle-errors-environment-list' into 'master' | Fatih Acet | 2017-01-19 | 3 | -1/+142 |
| |\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Error handling in environments list" Closes #25507 See merge request !8461 | ||||
| | * | | | | Adds tests | Filipa Lacerda | 2017-01-12 | 3 | -1/+142 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds changelog entry Finishes tests Fix eslint errors Fix teaspoon test timing out | ||||
| * | | | | | Merge branch '26601-dropdown-makes-request-close' into 'master' | Fatih Acet | 2017-01-19 | 1 | -5/+6 |
| |\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | Fixes builds dropdown making request when clicked to be closed Closes #26601 See merge request !8545 | ||||
| | * | | | | Use bootstrap dropdown events to only make the request when the dropdown is ↵26601-dropdown-makes-request-close | Filipa Lacerda | 2017-01-13 | 1 | -5/+6 |
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | being opened Fixes builds dropdown making request when clicked to be closed Adds MR ID to CHANGELOG Improve documentation Use bootstrap dropdown events to only make the request when the dropdown is being opened | ||||
| * | | | | Merge branch 'use-empty_project-factory-in-api-specs' into 'master' | Robert Speicher | 2017-01-19 | 19 | -54/+53 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Replace many :project with :empty_projects in API specs See merge request !8608 | ||||
| | * | | | | Replace many :project with :empty_projects in API specsuse-empty_project-factory-in-api-specs | Rémy Coutable | 2017-01-17 | 19 | -54/+53 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | | | | | Merge branch '26810-fix-undefined-method-revert_group_project_commit_path' ↵ | Robert Speicher | 2017-01-19 | 2 | -2/+4 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Ensure group acts as a namespace for polymorphic routes Closes #26810 See merge request !8627 | ||||
| | * | | | | | Ensure group acts as a namespace for polymorphic routes26810-fix-undefined-method-revert_group_project_commit_path | Rémy Coutable | 2017-01-18 | 2 | -2/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | | | | | | Merge branch 'fix-dashboard-spec' into 'master' | Rémy Coutable | 2017-01-19 | 1 | -1/+1 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix todos spec See merge request !8643 | ||||
| | * | | | | | | Fix todos spec | Sean McGivern | 2017-01-19 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was changed in a community MR, but the branch was far enough behind master that it didn't have this spec. | ||||
| * | | | | | | | Merge branch 'didemacet-markdown-area-height-fix' into 'master' 26874-avatar-misalign-builds-page | Fatih Acet | 2017-01-19 | 1 | -0/+27 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Autoresize markdown preview Closes #24372 See merge request !8607 | ||||
| | * | | | | | | | Autoresize markdown previewdidemacet-markdown-area-height-fix | Clement Ho | 2017-01-17 | 1 | -0/+27 |
| | | |_|/ / / / | |/| | | | | | |||||
| * | | | | | | | Merge branch 'feature/gitaly-feature-flag' into 'master' | Robert Speicher | 2017-01-19 | 1 | -0/+23 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Gitaly feature flag See merge request !8440 | ||||
| | * | | | | | | | Pass Gitaly resource path to gitlab-workhorse if Gitaly is enabledfeature/gitaly-feature-flag | Ahmad Sherif | 2017-01-18 | 1 | -0/+23 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge branch 'allow-shared-examples-jasmine' into 'master' | Fatih Acet | 2017-01-19 | 4 | -2/+48 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add jasmine helpers and run their specs Closes #26305 See merge request !8437 | ||||
| | * | | | | | | | | Add first shared examples to a helper and updated teaspoon_env to allow ↵allow-shared-examples-jasmine | Luke "Jared" Bennett | 2017-01-18 | 4 | -2/+48 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | helper specs to run | ||||
| * | | | | | | | | | Merge branch 'simple-eslint-fixes' into 'master' | Fatih Acet | 2017-01-19 | 34 | -382/+352 |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Simple eslint fixes See merge request !8536 | ||||
| | * | | | | | | | | | resolve all prefer-const eslint violations | Mike Greiling | 2017-01-18 | 3 | -17/+16 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | resolve all x-spacing and no-spaced-x eslint violations | Mike Greiling | 2017-01-18 | 6 | -98/+104 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | resolve all indent eslint violations | Mike Greiling | 2017-01-18 | 6 | -66/+69 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | resolve all no-trailing-spaces eslint violations | Mike Greiling | 2017-01-18 | 1 | -1/+1 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | resolve all padded-blocks eslint violations | Mike Greiling | 2017-01-18 | 28 | -66/+28 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | resolve all semi and no-extra-semi eslint violations | Mike Greiling | 2017-01-18 | 9 | -197/+197 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | resolve all no-plusplus eslint violations | Mike Greiling | 2017-01-18 | 5 | -21/+21 |
| | | |_|/ / / / / / | |/| | | | | | | | |||||
| * | | | | | | | | | Merge branch 'wip-mr-from-commits' into 'master' | Sean McGivern | 2017-01-19 | 5 | -1/+180 |
| |\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mark MR as WIP when pushing WIP commits Closes #25036 See merge request !8124 | ||||
| | * | | | | | | | | Show a custom WIP help message for MR's with WIP commits | jurre | 2017-01-19 | 1 | -0/+63 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Mark MR as WIP when pushing WIP commits | jurre | 2017-01-19 | 4 | -1/+117 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Merge branch '23563-document-presenters' into 'master' | Dmitriy Zaporozhets | 2017-01-19 | 7 | -0/+256 |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Document presenters Closes #23563 See merge request !8480 | ||||
| | * | | | | | | | | | More improvements to presenters23563-document-presenters | Rémy Coutable | 2017-01-18 | 8 | -91/+71 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| | * | | | | | | | | | Add Presentable concern | Rémy Coutable | 2017-01-18 | 1 | -0/+15 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| | * | | | | | | | | | Improve presenter factory | Rémy Coutable | 2017-01-18 | 2 | -48/+42 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| | * | | | | | | | | | Improve presenter architecture | Rémy Coutable | 2017-01-18 | 8 | -87/+202 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |