| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Split up MergeRequestsControllerdm-merge-request-creations-controller | Douwe Maan | 2017-06-28 | 23 | -675/+740 |
| | | |||||
| * | Resolve "Submitting reply to existing diff discussion using Cmd/Ctrl+Enter ↵ | Luke "Jared" Bennett | 2017-06-27 | 1 | -4/+17 |
| | | | | | submits twice and refreshes page" | ||||
| * | Merge branch 'gitlab-git-find-commits' into 'master' | Sean McGivern | 2017-06-27 | 2 | -49/+27 |
| |\ | | | | | | | | | Clean up Gitlab::Git::Commit.find_all See merge request !12476 | ||||
| | * | Remove 'contains' option from Commit.find_all | Jacob Vosmaer | 2017-06-27 | 1 | -20/+0 |
| | | | |||||
| | * | Remove Gitlab::Git::Repository#find_all | Jacob Vosmaer | 2017-06-27 | 2 | -29/+27 |
| | | | |||||
| * | | Resolve "Unable to access edit comment from dropdown menu in certain screen ↵ | Luke "Jared" Bennett | 2017-06-27 | 1 | -0/+1 |
| | | | | | | | | | sizes" | ||||
| * | | Merge branch 'issue-form-multiple-line-markdown' into 'master' | Filipa Lacerda | 2017-06-27 | 1 | -36/+69 |
| |\ \ | | | | | | | | | | | | | | | | | | | Fixed multi-line markdown in issue edit form Closes #34318 See merge request !12458 | ||||
| | * | | Fixed multi-line markdown in issue edit formissue-form-multiple-line-markdown | Phil Hughes | 2017-06-26 | 1 | -36/+69 |
| | | | | | | | | | | | | | Closes #34318 | ||||
| * | | | Merge branch 'zj-review-apps-usage-data' into 'master' | Grzegorz Bizon | 2017-06-27 | 1 | -0/+1 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Add review apps to usage ping Closes #33171 See merge request !12185 | ||||
| | * | | | Add in_review_folder to usage pingzj-review-apps-usage-data | Z.J. van de Weg | 2017-06-27 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As its hard to reliably check how many review apps there are on the clients machine, we start by checking where the type is `review`. This means the folder is called that way. This will lead to a seq scan on the table. However, this is done once a week, so the benefit of adding an index seems not to apply here. | ||||
| * | | | | Merge branch '34324-gitlab-db-seed-is-broken' into 'master' | Rémy Coutable | 2017-06-27 | 1 | -0/+4 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "GitLab DB seed is broken" Closes #34324 See merge request !12464 | ||||
| | * | | | | Fix Gitlab::Database.bulk_insert for non-UTF-8 data34324-gitlab-db-seed-is-broken | Sean McGivern | 2017-06-26 | 1 | -0/+4 |
| | | |/ / | |/| | | |||||
| * | | | | Merge branch 'pat-alert-when-signin-disabled' into 'master' | Rémy Coutable | 2017-06-27 | 5 | -22/+232 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Provide hint to create a personal access token for Git over HTTP See merge request !12105 | ||||
| | * | | | | Provide hint to create a personal access token for Git over HTTP | Robin Bobbitt | 2017-06-26 | 5 | -22/+232 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If internal auth is disabled and user is not an LDAP user, present the user with an alert to create a personal access token if he does not have one already. | ||||
| * | | | | | Merge branch 'sh-unset-stubenv' into 'master' | Rémy Coutable | 2017-06-27 | 1 | -0/+8 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Reset the state of StubENV's @env_already_stubbed after each spec run See merge request !12438 | ||||
| | * | | | | | Reset the state of StubENV's @env_already_stubbed after each spec runsh-unset-stubenv | Stan Hu | 2017-06-26 | 1 | -0/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In certain combination of tests, @env_already_stubbed could be set to `true` even though it never ran for that specific test. | ||||
| * | | | | | | Merge branch 'fix-33991' into 'master' | Sean McGivern | 2017-06-27 | 1 | -0/+51 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow users to subscribe to group labels on the group labels page Closes #33991 See merge request !12402 | ||||
| | * | | | | | | Improve scenario description for the group labels subscription spec | Douglas Barbosa Alexandre | 2017-06-26 | 1 | -1/+1 |
| | | | | | | | | |||||
| | * | | | | | | Allow users to subscribe to group labels on group labels page | Douglas Barbosa Alexandre | 2017-06-26 | 1 | -0/+51 |
| | | | | | | | | |||||
| * | | | | | | | Merge branch '23036-replace-dashboard-todo-spinach' into 'master' | Rémy Coutable | 2017-06-27 | 5 | -395/+395 |
| |\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | Replaces 'dashboard/todos' spinach with rspec See merge request !12453 | ||||
| | * | | | | | | Replaces 'dashboard/todos' spinach with rspec | Alexander Randa | 2017-06-26 | 5 | -395/+395 |
| | | | | | | | | |||||
| * | | | | | | | Merge branch '34052-store-mr-ref-fetched-in-database' into 'master' | Sean McGivern | 2017-06-27 | 2 | -1/+39 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Store merge request ref_fetched status in the database Closes #34052 See merge request !12424 | ||||
| | * | | | | | | | Store merge request ref_fetched status in the database34052-store-mr-ref-fetched-in-database | Adam Niedzielski | 2017-06-26 | 2 | -1/+39 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #34052 | ||||
| * | | | | | | | | Merge branch '34282-fix-api-using-include_missing-false' into 'master' | Grzegorz Bizon | 2017-06-27 | 1 | -0/+11 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix optional arugments for POST :id/variables Closes #34282 See merge request !12474 | ||||
| | * | | | | | | | | Fix optional args for POST :id/variables | Lin Jen-Shin | 2017-06-27 | 1 | -0/+11 |
| | | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Always use declared_params(include_missing: false) so that we don't give nils for optional arguments | ||||
| * | | | | | | | | Merge branch 'winh-mr-widget-no-pipeline' into 'master' | Phil Hughes | 2017-06-27 | 1 | -18/+48 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Handle missing pipeline in merge request widget Closes #32987 See merge request !12127 | ||||
| | * | | | | | | | | Handle Promise rejections in mr_widget_pipeline_spec.js | winh | 2017-06-26 | 1 | -24/+35 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Add failing test for #32987 | winh | 2017-06-22 | 1 | -0/+19 |
| | | |_|/ / / / / | |/| | | | | | | |||||
| * | | | | | | | | Polish sidebar toggle | Clement Ho | 2017-06-27 | 1 | -0/+25 |
| | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | | Merge branch 'fix-nested-group-spec-on-mysql' into 'master' | Robert Speicher | 2017-06-26 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tag a spec as :nested_groups since it fails on MySQL See merge request !12459 | ||||
| | * | | | | | | | Tag a spec as :nested_groups since it fails on MySQLfix-nested-group-spec-on-mysql | Rémy Coutable | 2017-06-26 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was broken by https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12322. Signed-off-by: Rémy Coutable <remy@rymai.me> | ||||
| * | | | | | | | | Add explicit message when no runners on admin | Takuya Noguchi | 2017-06-26 | 1 | -19/+42 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge branch '23036-replace-dashboard-mr-spinach' into 'master' | Rémy Coutable | 2017-06-26 | 3 | -28/+110 |
| |\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | Replace 'dashboard/merge_requests' spinach with rspec See merge request !12440 | ||||
| | * | | | | | | | Replaces 'dashboard/merge_requests' spinach with rspec | Alexander Randa | 2017-06-26 | 3 | -28/+110 |
| | | |/ / / / / | |/| | | | | | |||||
| * | | | | | | | Fix endpoint not being update correctly | Filipa Lacerda | 2017-06-26 | 1 | -0/+43 |
| | | | | | | | | |||||
| * | | | | | | | Merge branch '33933-fix-deployment-indicator-date' into 'master' | Robert Speicher | 2017-06-26 | 1 | -2/+5 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix bug where Service `created_at` time was used instead of deployment time. Closes #33933 See merge request !12395 | ||||
| | * | | | | | | | Fix bug where Service `created_at` time was used instead of deployment time.33933-fix-deployment-indicator-date | Pawel Chojnacki | 2017-06-22 | 1 | -2/+5 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge branch 'backport-renew-exclusive-lease' into 'master' | Douwe Maan | 2017-06-26 | 1 | -0/+13 |
| |\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | Backport from EE: Introduce #renew for ExclusiveLease See merge request !12436 | ||||
| | * | | | | | | | Introduce #renew for ExclusiveLeasebackport-renew-exclusive-lease | Gabriel Mazetto | 2017-06-24 | 1 | -0/+13 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge branch 'backport-destroy-service-spec-fixes' into 'master' | Douwe Maan | 2017-06-26 | 1 | -2/+3 |
| |\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | Backport from EE: Fixed DestroyService spec to actually test if removal was successful See merge request !12437 | ||||
| | * | | | | | | | Fixed DestroyService spec to actually test if removal was successfulbackport-destroy-service-spec-fixes | Gabriel Mazetto | 2017-06-24 | 1 | -2/+3 |
| | |/ / / / / / | |||||
| * | | | | | | | Merge branch '34302-update-test' into 'master' | Phil Hughes | 2017-06-26 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix click not being able to find the current element to use trigger('click') instead Closes #34302 See merge request !12447 | ||||
| | * | | | | | | | Fix click not being able to find the current element to use trigger('click') ↵34302-update-test | Filipa Lacerda | 2017-06-26 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | instead | ||||
| * | | | | | | | | Merge branch 'sh-revert-annotate-for-blame' into 'master' | Rémy Coutable | 2017-06-26 | 2 | -2/+2 |
| |\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | Revert "Annotate" to "Blame" See merge request !12401 | ||||
| | * | | | | | | | Revert "Annotate" to "Blame"sh-revert-annotate-for-blame | Stan Hu | 2017-06-22 | 2 | -2/+2 |
| | | |_|_|/ / / | |/| | | | | | |||||
| * | | | | | | | Merge branch 'winh-karma-suppress-vue-tips' into 'master' | Clement Ho | 2017-06-26 | 1 | -0/+4 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Suppress Vue tips when running Karma See merge request !12379 | ||||
| | * | | | | | | | Suppress Vue tips when running Karmawinh-karma-suppress-vue-tips | winh | 2017-06-22 | 1 | -0/+4 |
| | |/ / / / / / | |||||
| * | | | | | | | Merge branch 'feature/add-new-services' into 'master' | Sean McGivern | 2017-06-26 | 6 | -3/+101 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add additional user and email services See merge request !12125 | ||||
| | * | | | | | | | fix spec failures | James Lopez | 2017-06-23 | 2 | -2/+2 |
| | | | | | | | | | |||||
| | * | | | | | | | update code based on feedback | James Lopez | 2017-06-23 | 1 | -3/+3 |
| | | | | | | | | | |||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |