summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Reduce duplication in Commits::{CherryPickService,RevertService}22203-reduce-duplication-in-commits-cherry_pick_serviceRémy Coutable2016-09-153-27/+21
* Merge branch 'new-file-mobile-dropdown-fix' into 'master' Fatih Acet2016-09-151-0/+4
|\
| * Fixed add to tree button on mobilenew-file-mobile-dropdown-fixPhil Hughes2016-09-141-0/+4
* | Merge branch 'fix-multiple-pipeline-events' into 'master' 22202-similar-code-found-in-defn-mass-108-in-lib-gitlab-diff-position_tracer-rb-98-lib-gitlab-diff-position_tracer-rb-119Rémy Coutable2016-09-154-25/+38
|\ \
| * | Fix Commit#status, feedback:fix-multiple-pipeline-eventsLin Jen-Shin2016-09-143-3/+3
| * | Fix EnglishLin Jen-Shin2016-09-131-4/+4
| * | Add a test for #22010Lin Jen-Shin2016-09-131-4/+18
| * | Fix stylingLin Jen-Shin2016-09-131-7/+7
| * | should show the status of the latest oneLin Jen-Shin2016-09-122-2/+2
| * | Revert "reload instead, so that we don't have to change order"Lin Jen-Shin2016-09-121-11/+4
| * | reload instead, so that we don't have to change orderLin Jen-Shin2016-09-121-4/+11
| * | Fix test (credits to Kamil)Lin Jen-Shin2016-09-121-3/+4
| * | Fix the ordering of transition callbacks:Lin Jen-Shin2016-09-121-7/+5
* | | Merge branch 'update-implement-design-ui-elements-in-CONTRIBUTING' into 'mast...Rémy Coutable2016-09-151-16/+2
|\ \ \
| * | | Simplify the 'Implement design & UI elements' section in CONTRIBUTINGupdate-implement-design-ui-elements-in-CONTRIBUTINGRémy Coutable2016-09-071-16/+2
* | | | Merge branch 'fix_custom_hook_envs' into 'master' Rémy Coutable2016-09-152-5/+8
|\ \ \ \
| * | | | Clean environment variables when running git hooksfix_custom_hook_envsValery Sizov2016-09-152-5/+8
* | | | | Merge branch 'rs-update-rubocop' into 'master' Rémy Coutable2016-09-153-57/+76
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Regenerate .rubocop_todo.yml based on rubocop 0.42.0Robert Speicher2016-09-141-53/+72
| * | | | Bump rubocop to 0.42.0Robert Speicher2016-09-142-4/+4
* | | | | Merge branch 'sh-allow-flay-flog-failure' into 'master' Stan Hu2016-09-151-2/+6
|\ \ \ \ \
| * | | | | Allow flay and flog to fail for nowStan Hu2016-09-141-2/+6
* | | | | | Merge branch 'sh-flay-ignore-svg-whitelist' into 'master' Stan Hu2016-09-151-0/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Ignore SVG whitelist code from flaysh-flay-ignore-svg-whitelistStan Hu2016-09-141-0/+1
|/ / / / /
* | | | | Merge branch 'houqp-master' into 'master' Robert Speicher2016-09-143-0/+9
|\ \ \ \ \
| * | | | | Fix URLs with anchors in wikiQingping Hou2016-09-133-0/+9
* | | | | | Add missing 8.10.9 CHANGELOG entriesRémy Coutable2016-09-141-0/+7
* | | | | | Merge branch 'master' of https://dev.gitlab.org/gitlab/gitlabhqRémy Coutable2016-09-142-11/+64
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch '21650-only-active-users-can-be-members' into 'master' Douwe Maan2016-09-142-11/+64
| |\ \ \ \ \ \
| | * | | | | | Exclude some pending or inactivated rows in Member scopesNick Thomas2016-09-082-11/+64
* | | | | | | | Update CHANGELOG for 8.9.9 and 8.11.6Rémy Coutable2016-09-141-2/+11
* | | | | | | | Merge branch 'fix-remove-merge-request-diff-unique-index' into 'master' Rémy Coutable2016-09-141-3/+17
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix migration for removing MR diff indexesYorick Peterse2016-09-141-3/+17
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge branch 'update-gitlab-git' into 'master' Douwe Maan2016-09-144-4/+36
|\ \ \ \ \ \ \ \
| * | | | | | | | Handle encoding in non-binary Blob instancesupdate-gitlab-gitYorick Peterse2016-09-142-0/+32
| * | | | | | | | Update gitlab_git to 10.6.6Yorick Peterse2016-09-142-4/+4
* | | | | | | | | Merge branch 'backport_to_search_helper_from_ee' into 'master' Rémy Coutable2016-09-146-60/+66
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Backport search_helper changes from EEbackport_to_search_helper_from_eeValery Sizov2016-09-146-60/+66
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch '5874-add-specs-for-removing-project' into 'master' Douwe Maan2016-09-143-3/+40
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | add test about flash alertubudzisz2016-09-143-3/+40
* | | | | | | | | | Merge branch '21748-updating-omniauth-facebook' into 'master' Douwe Maan2016-09-142-4/+4
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Update omniauth-facebook to '~>4.0.0'Katarzyna Kobierska2016-09-132-4/+4
* | | | | | | | | | | Merge branch 'document-checkout-mr-from-forks-locally' into 'master' Job van der Voort2016-09-141-0/+3
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Document the fact that merge requests from private forks can be checked out l...document-checkout-mr-from-forks-locallyRémy Coutable2016-09-131-0/+3
* | | | | | | | | | | Merge branch 'gitlab_shell_350' into 'master' 21249-update-labels-sidebar-live-after-slash-command-existing-issue-mr-ajaxRémy Coutable2016-09-142-2/+2
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Update the 8.11 to 8.12 update documentation to use gitlab-shell 3.5.0Rémy Coutable2016-09-141-1/+1
| * | | | | | | | | | Update GITLAB_SHELL_VERSIONDrew Blessing2016-09-141-1/+1
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'fix/gitlab-popen-thread-safety' into 'master' Stan Hu2016-09-142-6/+7
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix Gitlab::Popen.popen thread-safety issuefix/gitlab-popen-thread-safetyAhmad Sherif2016-09-132-6/+7
* | | | | | | | | | | Merge branch 'pushes-since-gc-redis' into 'master' 19600-artifacts-show-up-in-interface-as-expired-immediately-although-configured-as-1-month-or-4-weeksRobert Speicher2016-09-137-33/+99
|\ \ \ \ \ \ \ \ \ \ \
View Lorry Controller Status