summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'patch-1' into 'master' Hannes Rosenögger2016-07-041-4/+6
|\
| * Add note on changing password of SSH keyCaesar Schinas2016-05-251-3/+6
| * Update README.md - SSH password can be changed with `ssh-keygen -p`Caesar Schinas2016-05-141-2/+1
* | Merge branch 'save-artifacts_sizes' into 'master' Rémy Coutable2016-07-046-21/+69
|\ \
| * | Use describe rather than context for this:save-artifacts_sizesLin Jen-Shin2016-07-041-1/+1
| * | Explicitly set to nil when artifacts don't exist:Lin Jen-Shin2016-07-041-0/+2
| * | Merge remote-tracking branch 'upstream/master' into save-artifacts_sizesLin Jen-Shin2016-07-04704-3380/+8041
| |\ \
| * | | Add a new column `artifacts_size` to table `ci_builds` !4964Lin Jen-Shin2016-07-041-0/+1
| * | | Use describe rather than context, feedback from:Lin Jen-Shin2016-07-041-1/+1
| * | | Rename to "successful artifacts upload", feedback:Lin Jen-Shin2016-07-041-4/+4
| * | | Rename shared_examples, feedback:Lin Jen-Shin2016-07-011-4/+4
| * | | Remove migration guide comment:Lin Jen-Shin2016-07-011-3/+0
| * | | Use nil for non-existing files rather than 0Lin Jen-Shin2016-07-012-2/+4
| * | | Use AR callbacks as suggested by:Lin Jen-Shin2016-06-293-4/+11
| * | | Also remove ci_builds.artifacts_size when erasedLin Jen-Shin2016-06-282-0/+2
| * | | Prefer Ci::Build#erase_artifacts!Lin Jen-Shin2016-06-281-2/+1
| * | | Just save the size in total rather than individual filesLin Jen-Shin2016-06-285-36/+14
| * | | Introduce ci_builds.artifacts_sizes as JSON:Lin Jen-Shin2016-06-284-3/+44
| * | | Cleanup the tests a bit in order to extend itLin Jen-Shin2016-06-281-15/+34
* | | | Merge branch 'update-spring-to-1.7.2' into 'master' Rémy Coutable2016-07-041-1/+1
|\ \ \ \
| * | | | Update spring to 1.7.2 to fix hanging rails consoleupdate-spring-to-1.7.2Kamil Trzcinski2016-07-041-1/+1
| | |/ / | |/| |
* | | | Merge branch 'git_hooks_better_message' into 'master' Dmitriy Zaporozhets2016-07-049-28/+36
|\ \ \ \ | |/ / / |/| | |
| * | | Better message for git hooks and file locksValery Sizov2016-07-049-28/+36
|/ / /
* | | Merge branch '13524-keep-around-commits' into 'master' Douwe Maan2016-07-0412-7/+88
|\ \ \
| * | | Document Repository#keep_aroundDouwe Maan2016-07-041-4/+8
| * | | Don't garbage collect commits that have related DB records like commentsDouwe Maan2016-07-0412-7/+84
* | | | Merge branch 'downgrade-redis-3-2-2' into 'master' Robert Speicher2016-07-032-1/+2
|\ \ \ \
| * | | | Downgrade to Redis 3.2.2 due to massive memory leak with Sidekiqdowngrade-redis-3-2-2Stan Hu2016-07-012-1/+2
| |/ / /
* | | | Merge branch 'redcloth-4-3-2-cve-2012-6684' into 'master' Stan Hu2016-07-033-3/+4
|\ \ \ \
| * | | | Update CHANGELOGTakuya Noguchi2016-07-031-0/+1
| * | | | Update RedCloth to 4.3.2 for CVE-2012-6684Takuya Noguchi2016-07-032-3/+3
* | | | | Merge branch '19448-merge-requests-api-has-incorrect-documentation-regarding-...Robert Schilling2016-07-031-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix typo in Merge Requests API documentation19448-merge-requests-api-has-incorrect-documentation-regarding-merge_when_build_succeedsAlejandro Rodríguez2016-07-021-1/+1
|/ / / /
* | | | Merge branch 'git-http-kerberos-ce' into 'master' Douwe Maan2016-07-013-16/+59
|\ \ \ \
| * | | | Groundwork for Kerberos SPNEGO (EE feature)Jacob Vosmaer2016-07-013-16/+59
* | | | | Merge branch 'explicit-requesters-scope' into 'master' Douwe Maan2016-07-0131-98/+225
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Exclude requesters from Project#members, Group#members and User#membersexplicit-requesters-scopeRémy Coutable2016-07-0131-98/+225
* | | | | Merge branch 'upgrade-sidekiq' into 'master' Robert Speicher2016-07-011-3/+4
|\ \ \ \ \
| * | | | | Upgrade Sidekiq from 4.1.2 to 4.1.4.upgrade-sidekiqConnor Shea2016-07-011-3/+4
* | | | | | Merge branch 'upgrade-seedfu' into 'master' Robert Speicher2016-07-011-3/+3
|\ \ \ \ \ \
| * | | | | | Upgrade seed-fu from 2.3.5 to 2.3.6upgrade-seedfuConnor Shea2016-07-011-3/+3
| |/ / / / /
* | | | | | Merge branch 'upgrade-sass-rails' into 'master' Robert Speicher2016-07-011-2/+2
|\ \ \ \ \ \
| * | | | | | Upgrade sass-rails.upgrade-sass-railsConnor Shea2016-06-301-2/+2
* | | | | | | Merge branch 'rubocop/enable-cops-for-empty-lines' into 'master' Robert Speicher2016-07-01162-238/+1
|\ \ \ \ \ \ \
| * | | | | | | Enable Style/EmptyLines cop, remove redundant onesrubocop/enable-cops-for-empty-linesGrzegorz Bizon2016-07-01162-238/+1
* | | | | | | | Merge branch 'renable-import-button-when-namespace-already-been-taken' into '...Fatih Acet2016-07-013-5/+12
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Update CHANGELOGDouglas Barbosa Alexandre2016-07-011-0/+1
| * | | | | | | Cache results from jQuery selectors to retrieve namespace nameDouglas Barbosa Alexandre2016-07-011-4/+7
| * | | | | | | Fix import button when import fail due the namespace already been takenDouglas Barbosa Alexandre2016-07-012-2/+5
|/ / / / / / /
* | | | | | | Merge branch '19388-fix-snippets-notes-not-shown' into 'master' Rémy Coutable2016-07-011-1/+1
|\ \ \ \ \ \ \
View Lorry Controller Status