summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fixed last push event banner not being in containerpush-event-banner-containerPhil Hughes2016-06-142-11/+15
* Merge branch 'bentolor/gitlab-ce-fix/bamboo-service-trigger-auth' into 'master' Rémy Coutable2016-06-145-48/+57
|\
| * Fix broken URI joining for `teamcity_url` with suffixesRémy Coutable2016-06-143-23/+25
| * Factorize duplicated code into a method in BambooService and update specsRémy Coutable2016-06-142-26/+23
| * Fix broken URI joining for `bamboo_url` with suffixesBenjamin Schmid2016-06-142-4/+5
| * Honor credentials on calling Bamboo CI triggerBenjamin Schmid2016-06-141-4/+13
* | Merge branch 'issue_14572' into 'master' Rémy Coutable2016-06-143-10/+62
|\ \
| * | Apply reviewer notes: update CHANGELOG, adjust code formattingAlexander Matyushentsev2016-06-132-8/+7
| * | Move issue rendering tests into separate contextsAlexander Matyushentsev2016-06-131-21/+37
| * | Move change description to proper release and fix typoAlexander Matyushentsev2016-06-131-1/+1
| * | Add more information into RSS fead for issuesAlexander Matyushentsev2016-06-133-10/+47
* | | Merge branch 'retry-spinach-tests' into 'master' Rémy Coutable2016-06-141-3/+1
|\ \ \ | |_|/ |/| |
| * | Revert CHANGELOGretry-spinach-testsKamil Trzcinski2016-06-131-1/+0
| * | Use bundle exec to run spinachKamil Trzcinski2016-06-101-1/+1
| * | Merge remote-tracking branch 'origin/master' into retry-spinach-testsKamil Trzcinski2016-06-10570-1175/+2976
| |\ \
| * | | Retry spinach tests in case of failure using rerun reporterKamil Trzcinski2016-06-082-3/+2
* | | | Merge branch 'remove-deprecated-issues-tracker-columns-from-projects' into 'm...Robert Speicher2016-06-138-63/+13
|\ \ \ \
| * | | | Update CHANGELOGremove-deprecated-issues-tracker-columns-from-projectsDouglas Barbosa Alexandre2016-06-131-0/+1
| * | | | Remove deprecated issues_tracker and issues_tracker_id from projectDouglas Barbosa Alexandre2016-06-137-63/+12
|/ / / /
* | | | Merge branch 'fix-schema' into 'master' Robert Speicher2016-06-131-4/+3
|\ \ \ \
| * | | | Schema doesn’t reflect the changes of the last 3 migrationsDouglas Barbosa Alexandre2016-06-131-4/+3
|/ / / /
* | | | Merge branch 'dz-cleanup-counters' into 'master' Dmitriy Zaporozhets2016-06-131-2/+0
|\ \ \ \
| * | | | Remove counters from Pipeline navigationdz-cleanup-countersDmitriy Zaporozhets2016-06-131-2/+0
* | | | | Merge branch 'gitlab-auth-method-names' into 'master' Douwe Maan2016-06-138-22/+22
|\ \ \ \ \
| * | | | | Also rename "find" in the specsJacob Vosmaer2016-06-131-5/+5
| * | | | | Improve Gitlab::Auth method namesJacob Vosmaer2016-06-108-17/+17
* | | | | | Merge branch 'style/enable-multiline-block-chain-rubocop-cop' into 'master' Robert Speicher2016-06-131-1/+1
|\ \ \ \ \ \
| * | | | | | Enable Style/MultilineBlockChain rubocop style copstyle/enable-multiline-block-chain-rubocop-copGrzegorz Bizon2016-06-101-1/+1
* | | | | | | Merge branch 'upgrade-brakeman' into 'master' Robert Speicher2016-06-132-24/+6
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Update brakeman from 3.2.1 to 3.3.2Connor Shea2016-06-122-24/+6
* | | | | | | Merge branch 'fix-related-branches-error-500' into 'master' Kamil Trzciński2016-06-131-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Fix typo causing related branches to Error 500fix-related-branches-error-500Stan Hu2016-06-121-1/+1
| |/ / / / / /
* | | | | | | Merge branch 'fix-bulk-assign-labels' into 'master' Jacob Schatz2016-06-132-4/+30
|\ \ \ \ \ \ \
| * | | | | | | Fixes a bug when assigning a label to multiple issuesfix-bulk-assign-labelsAlfredo Sumaran2016-06-102-4/+30
* | | | | | | | Merge branch 'artifacts-when' into 'master' Rémy Coutable2016-06-134-1/+78
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/master' into artifacts-whenKamil Trzcinski2016-06-13605-1418/+3670
| |\ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
* | | | | | | | | Merge branch 'cache-apt-and-ruby-only' into 'master' Rémy Coutable2016-06-132-3/+4
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Cache only apt and ruby from vendorcache-apt-and-ruby-onlyKamil Trzcinski2016-06-122-3/+4
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'instrument-reference-parsers' into 'master' Rémy Coutable2016-06-132-6/+12
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Instrument all Banzai::ReferenceParser classesinstrument-reference-parsersYorick Peterse2016-06-132-6/+12
* | | | | | | | | | Merge branch 'doc-styleguide-move-locations' into 'master' Achilleas Pipinellis2016-06-131-0/+42
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add guide on changing a document's locationAchilleas Pipinellis2016-06-131-0/+42
* | | | | | | | | | | Merge branch 'fix-notes-doc-styleguide' into 'master' Achilleas Pipinellis2016-06-131-5/+5
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Change to new Notes styleguideAchilleas Pipinellis2016-06-131-5/+5
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'fix-migration-helper-race-conditions' into 'master' Rémy Coutable2016-06-132-6/+20
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Removed old comment from update_column_in_batchesfix-migration-helper-race-conditionsYorick Peterse2016-06-131-2/+0
| * | | | | | | | | | | Update columns in batches until no rows are leftYorick Peterse2016-06-131-2/+5
| * | | | | | | | | | | Handle NULL migration errors in migration helpersYorick Peterse2016-06-132-2/+15
| | |/ / / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch '18377-cherry-pick-crashes-when-choosing-a-tag' into 'master' Rémy Coutable2016-06-134-1/+7
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Only show branches for revert / cherry-pick18377-cherry-pick-crashes-when-choosing-a-tagSean McGivern2016-06-134-1/+7