summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | | | | Add basic client for the GitHub APIDouglas Barbosa Alexandre2017-04-2411-0/+250
| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Add faraday gemDouglas Barbosa Alexandre2017-04-242-10/+20
| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge branch 'more-mr-filters' into 'master' Sean McGivern2017-04-265-21/+98
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | More merge request filters Closes #26301 See merge request !10924
| * | | | | | | | | | | | | | | | | | Add documentation example for labelsmore-mr-filtersRobert Schilling2017-04-261-0/+1
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Add changelog entryRobert Schilling2017-04-261-0/+4
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Ability to filter merge requests by labels and milestonesRobert Schilling2017-04-254-21/+93
| | |_|_|_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge branch 'blackst0ne/gitlab-ce-add_index_on_ci_builds_user_id'Yorick Peterse2017-04-263-0/+24
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This manually merges https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/10874 into master after resolving conflicts.
| * | | | | | | | | | | | | | | | | | Add index on ci_builds.user_idblackst0ne2017-04-263-0/+24
|/ / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | Merge branch '28202_decrease_abc_threshold_step1' into 'master' Rémy Coutable2017-04-263-17/+24
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Decrease ABC threshold to 57.08 See merge request !10724
| * | | | | | | | | | | | | | | | | | Decrease ABC threshold to 57.08Maxim Rydkin2017-04-263-17/+24
|/ / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | Merge branch '31362_decrease_cyclomatic_complexity_threshold_step1' into ↵Rémy Coutable2017-04-263-41/+35
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Decrease Cyclomatic Complexity threshold to 16 See merge request !10928
| * | | | | | | | | | | | | | | | | | Decrease Cyclomatic Complexity threshold to 16Maxim Rydkin2017-04-263-41/+35
|/ / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | Merge branch '31437-fix-transient-failure' into 'master' Sean McGivern2017-04-261-2/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't expect underlying DB data to be updated in feature spec Closes #31437 See merge request !10934
| * | | | | | | | | | | | | | | | | | Don't expect underlying DB data to be updated in feature specRémy Coutable2017-04-261-2/+1
| | |_|_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only assert that the page shows something, this waits for requests to be completed. Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | | | | | | | | | | Merge branch 'group-assignee-dropdown-send-group-id' into 'master' Filipa Lacerda2017-04-264-1/+22
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Assignee filter on group issues/merge requests only loads group users Closes #29490 See merge request !10884
| * | | | | | | | | | | | | | | | | Assignee filter on group issues/merge requests only loads group usersgroup-assignee-dropdown-send-group-idPhil Hughes2017-04-244-1/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #29490
* | | | | | | | | | | | | | | | | | Merge branch '20378-natural-sort-issue-numbers' into 'master'Sean McGivern2017-04-265-9/+132
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change issues sentence to use natural sorting Closes #20378 See merge request !7110
| * | | | | | | | | | | | | | | | | | Change issues sentence to use natural sortingJeff Stubler2017-04-255-9/+132
| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge branch '31280-skip-issueables-without-project' into 'master' Sean McGivern2017-04-264-26/+65
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Skip issuable without a project in IssuableExtractor#extract Closes #31280 See merge request !10906
| * | | | | | | | | | | | | | | | | | | issues_for_nodes => issuables_for_nodes31280-skip-issueables-without-projectLin Jen-Shin2017-04-261-3/+3
| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Follow feedback on the reviewLin Jen-Shin2017-04-262-27/+51
| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Skip issuable without a project in IssuableExtractor#extractLin Jen-Shin2017-04-254-56/+71
| | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #31280
* | | | | | | | | | | | | | | | | | | Merge branch '31294-fix-oauth-users-do-not-need-to-be-confirmed-master' into ↵Sean McGivern2017-04-264-9/+57
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Ensures that OAuth/LDAP/SAML users don't need to be confirmed Closes #31294 See merge request !10926
| * | | | | | | | | | | | | | | | | | Fix logic in Users::CreateService broken by the fix for OAuth usersRémy Coutable2017-04-261-8/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
| * | | | | | | | | | | | | | | | | | Ensures that OAuth/LDAP/SAML users don't need to be confirmedRémy Coutable2017-04-264-4/+45
|/ / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | | | | | | | | | | Merge branch 'dz-bump-gitlab-shell' into 'master' Douwe Maan2017-04-251-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bump gitlab-shell version to 5.0.3 See merge request !10922
| * | | | | | | | | | | | | | | | | | Bump gitlab-shell version to 5.0.3Dmitriy Zaporozhets2017-04-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | | | | | | | | | | | | | | Merge branch ↵Robert Speicher2017-04-254-52/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '30692-document-rspec-profile-and-mysql-branch-testing-and-remove-ci_setup-doc-page' into 'master' Remove outdated ci_setup.md doc page and document MySQL and RSpec profiling for specific branches Closes #30692 See merge request !10916
| * | | | | | | | | | | | | | | | | | | Remove outdated ci_setup.md doc page and document MySQL and RSpec profiling ↵30692-document-rspec-profile-and-mysql-branch-testing-and-remove-ci_setup-doc-pageRémy Coutable2017-04-254-52/+13
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for specific branches Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | | | | | | | | | | | Merge branch 'update-mr-diff-blob-fork-suggestion-after-jquery-udpate' into ↵Stan Hu2017-04-251-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Update MR diff blob_fork_suggestion after jQuery update See merge request !10921
| * | | | | | | | | | | | | | | | | | | Update MR diff blob_fork_suggestion after jQuery updateupdate-mr-diff-blob-fork-suggestion-after-jquery-udpateEric Eastwood2017-04-251-1/+2
|/ / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `.init()` was added in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/10858 We need to add it the MR diff instance that was added in a separate MR and of course didn't add a conflict because it is a completely different piece
* | | | | | | | | | | | | | | | | | | Merge branch 'metrics-graph-error-fix' into 'master' Phil Hughes2017-04-252-29/+38
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Metrics graph error fix Closes #30840 See merge request !10839
| * | | | | | | | | | | | | | | | | | | Metrics graph error fixJose Ivan Vargas Lopez2017-04-252-29/+38
|/ / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | Merge branch 'mr-diff-size-overflow' into 'master' Douwe Maan2017-04-256-27/+52
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Show correct size when MR diff overflows Closes #26560 See merge request !10827
| * | | | | | | | | | | | | | | | | | Show correct size when MR diff overflowsSean McGivern2017-04-256-27/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem is that we often go via a diff object constructed from the diffs stored in the DB. Those diffs, by definition, don't overflow, so we don't have access to the 'correct' `real_size` - that is stored on the MR diff object iself.
* | | | | | | | | | | | | | | | | | | Merge branch '27827-cleanup-markdown' into 'master' Phil Hughes2017-04-2512-38/+48
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Clean up padding with Markdown headers" Closes #27827 See merge request !10350
| * | | | | | | | | | | | | | | | | | | Resolve "Clean up padding with Markdown headers"Taurie Davis2017-04-2512-38/+48
|/ / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | Merge branch 'sh-bump-sidekiq-version' into 'master' Robert Speicher2017-04-252-1/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upgrade Sidekiq to 4.2.10 See merge request !10899
| * | | | | | | | | | | | | | | | | | | Upgrade Sidekiq to 4.2.10sh-bump-sidekiq-versionStan Hu2017-04-242-1/+5
| | |_|_|_|_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See https://github.com/mperham/sidekiq/blob/master/Changes.md#4210
* | | | | | | | | | | | | | | | | | | Merge branch '31174-project-integration-service-sub-nav' into 'master' Alfredo Sumaran2017-04-254-2/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add sub-nav for Project Integration Services edit page Closes #31174 See merge request !10813
| * | | | | | | | | | | | | | | | | | | Add sub-nav for Project Integration Services edit pageKushal Pandya2017-04-254-2/+7
|/ / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | Merge branch 'dm-fix-oauth-user-creation' into 'master' Robert Speicher2017-04-257-5/+47
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix OAuth, LDAP and SAML SSO when regular sign-ups are disabled Closes #31294 See merge request !10896
| * | | | | | | | | | | | | | | | | | | Fix OAuth, LDAP and SAML SSO when regular sign-ups are disableddm-fix-oauth-user-creationDouwe Maan2017-04-247-5/+47
| |/ / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | Merge branch 'fix/web_hooks-index' into 'master' Douwe Maan2017-04-253-1/+21
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add index to webhooks type column Closes #31232 See merge request !10883
| * | | | | | | | | | | | | | | | | | Add index to webhooks type columnJames Lopez2017-04-253-1/+21
|/ / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | Merge branch 'ignore-all-builds-dirs' into 'master' Rémy Coutable2017-04-251-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ignore all builds* directories from version control See merge request !10903
| * | | | | | | | | | | | | | | | | | Ignore all builds* directories from version controlignore-all-builds-dirsAchilleas Pipinellis2017-04-251-1/+1
| | |_|_|_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The restore process copies the old builds/ dir into builds.<epoch>/ which results in Git complaining about untracked files
* | | | | | | | | | | | | | | | | | Merge branch '31276-fix-diffs-with-edit-forking-needs' into 'master' Douwe Maan2017-04-256-21/+64
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix diffs with edit-forking needs Closes #31276 See merge request !10868
| * | | | | | | | | | | | | | | | | Fix diffs with edit-forking needs31276-fix-diffs-with-edit-forking-needsEric Eastwood2017-04-246-21/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/31276
* | | | | | | | | | | | | | | | | | Merge branch 'fix-usage-ping-doc-link' into 'master' Rémy Coutable2017-04-252-1/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix usage ping docs link from empty cohorts page See merge request !10907