summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Make rubocop love me again zj-rspec-setZeger-Jan van de Weg2017-04-261-1/+1
* Merge branch 'master' into 'zj-rspec-set'Rémy Coutable2017-04-261016-12494/+12007
|\
| * Merge branch '28202_decrease_abc_threshold_step1' into 'master' Rémy Coutable2017-04-263-17/+24
| |\
| | * Decrease ABC threshold to 57.08Maxim Rydkin2017-04-263-17/+24
| |/
| * Merge branch '31362_decrease_cyclomatic_complexity_threshold_step1' into 'mas...Rémy Coutable2017-04-263-41/+35
| |\
| | * 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 specRémy Coutable2017-04-261-2/+1
| * | 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 usersgroup-assignee-dropdown-send-group-idPhil Hughes2017-04-244-1/+22
| * | | Merge branch '20378-natural-sort-issue-numbers' into 'master'Sean McGivern2017-04-265-9/+132
| |\ \ \
| | * | | 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
| |\ \ \ \
| | * | | | 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
| * | | | | Merge branch '31294-fix-oauth-users-do-not-need-to-be-confirmed-master' into ...Sean McGivern2017-04-264-9/+57
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | Fix logic in Users::CreateService broken by the fix for OAuth usersRémy Coutable2017-04-261-8/+15
| | * | | | Ensures that OAuth/LDAP/SAML users don't need to be confirmedRémy Coutable2017-04-264-4/+45
| |/ / / /
| * | | | Merge branch 'dz-bump-gitlab-shell' into 'master' Douwe Maan2017-04-251-1/+1
| |\ \ \ \
| | * | | | Bump gitlab-shell version to 5.0.3Dmitriy Zaporozhets2017-04-251-1/+1
| * | | | | Merge branch '30692-document-rspec-profile-and-mysql-branch-testing-and-remov...Robert Speicher2017-04-254-52/+13
| |\ \ \ \ \
| | * | | | | Remove outdated ci_setup.md doc page and document MySQL and RSpec profiling f...30692-document-rspec-profile-and-mysql-branch-testing-and-remove-ci_setup-doc-pageRémy Coutable2017-04-254-52/+13
| * | | | | | Merge branch 'update-mr-diff-blob-fork-suggestion-after-jquery-udpate' into '...Stan Hu2017-04-251-1/+2
| |\ \ \ \ \ \
| | * | | | | | Update MR diff blob_fork_suggestion after jQuery updateupdate-mr-diff-blob-fork-suggestion-after-jquery-udpateEric Eastwood2017-04-251-1/+2
| |/ / / / / /
| * | | | | | Merge branch 'metrics-graph-error-fix' into 'master' Phil Hughes2017-04-252-29/+38
| |\ \ \ \ \ \
| | * | | | | | 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 overflowsSean McGivern2017-04-256-27/+52
| * | | | | | Merge branch '27827-cleanup-markdown' into 'master' Phil Hughes2017-04-2512-38/+48
| |\ \ \ \ \ \
| | * | | | | | 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.10sh-bump-sidekiq-versionStan Hu2017-04-242-1/+5
| * | | | | | | Merge branch '31174-project-integration-service-sub-nav' into 'master' Alfredo Sumaran2017-04-254-2/+7
| |\ \ \ \ \ \ \
| | * | | | | | | 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 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 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 controlignore-all-builds-dirsAchilleas Pipinellis2017-04-251-1/+1
| * | | | | | | Merge branch '31276-fix-diffs-with-edit-forking-needs' into 'master' Douwe Maan2017-04-256-21/+64
| |\ \ \ \ \ \ \
| | * | | | | | | Fix diffs with edit-forking needs31276-fix-diffs-with-edit-forking-needsEric Eastwood2017-04-246-21/+64
| * | | | | | | | Merge branch 'fix-usage-ping-doc-link' into 'master' Rémy Coutable2017-04-252-1/+5
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Fix usage ping docs link from empty cohorts pagefix-usage-ping-doc-linkSean McGivern2017-04-252-1/+5
| * | | | | | | | | Merge branch 'patch-17' into 'master' Rémy Coutable2017-04-251-8/+10
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Update markdown.mdSimon Hardt2017-04-251-8/+10
| |/ / / / / / / / /
| * | | | | | | | | Merge branch '21683-show-created-group-name-flash' into 'master' Sean McGivern2017-04-252-1/+5
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / | |/| | | | | | | |
| | * | | | | | | | Show group name on flash container when group is created from Admin areaKushal Pandya2017-04-252-1/+5
| |/ / / / / / / /
| * | | | | | | | Merge branch '29903-remove-user-is-admin-flag-from-api' into 'master' Sean McGivern2017-04-2512-23/+27
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | |