summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Simplify Issue and MergeRequest UpdateServicesrs-remove-task-statesRobert Speicher2015-07-082-10/+4
* Remove unused `task_[un]check` states from Update servicesRobert Speicher2015-07-082-11/+2
* Merge branch 'use_teaspoon' into 'master'Achilleas Pipinellis2015-07-081-1/+1
|\
| * use teaspoon instead of jasmine for testing javascriptFrancesco Coda Zabetta2015-07-081-1/+1
|/
* Merge branch 'add-ie-compat-notice' into 'master'Job van der Voort2015-07-081-1/+5
|\
| * Added info about common UI problems if IE Compatibility View mode is enabled.add-ie-compat-noticePatricio Cano2015-07-071-1/+5
* | Merge branch 'master' of github.com:gitlabhq/gitlabhqJacob Vosmaer2015-07-081-1/+1
|\ \
| * \ Merge pull request #9435 from bbodenmiller/patch-1stanhu2015-07-071-1/+1
| |\ \ | | |/ | |/|
| | * use relative link to SSH setup pageBen Bodenmiller2015-07-061-1/+1
* | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceJacob Vosmaer2015-07-083-3/+3
|\ \ \
| * \ \ Merge branch 'patch-1' into 'master'Robert Schilling2015-07-081-1/+1
| |\ \ \
| | * | | Fix Transfer project input width.Metalaka2015-07-071-1/+1
| * | | | Merge branch 'fix-irker-capitalization' into 'master'Robert Schilling2015-07-082-2/+2
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Change "Irc Uri" -> "IRC URI"Stan Hu2015-07-072-2/+2
* | | | | Merge branch 'improve-postgres-restore-cleaning' into 'master' Dmitriy Zaporozhets2015-07-074-25/+3
|\ \ \ \ \
| * | | | | Use native Postgres database cleaning during backup restoreJacob Vosmaer2015-07-074-25/+3
| | |_|_|/ | |/| | |
* | | | | Merge branch 'create-group' into 'master' Job van der Voort2015-07-076-1/+46
|\ \ \ \ \
| * | | | | fixed textkaren Carias2015-07-071-10/+14
| * | | | | fixed typokaren Carias2015-07-071-3/+3
| * | | | | fixed imagekaren Carias2015-07-072-2/+2
| * | | | | fixed document with improved instructionskaren Carias2015-07-073-15/+11
| * | | | | new doc about creating groupskaren Carias2015-07-023-1/+46
* | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceSytse Sijbrandij2015-07-071-1/+3
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Add link to multiple app servers.Sytse Sijbrandij2015-07-071-0/+2
| | |_|_|/ | |/| | |
* | | | | Specify that swap will be slow.Sytse Sijbrandij2015-07-071-9/+10
|/ / / /
* | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-07-0715-19/+253
|\ \ \ \
| * \ \ \ Merge branch 'compress-db' into 'master'Kamil TrzciƄski2015-07-073-1/+20
| |\ \ \ \
| | * | | | Compress database backupKamil Trzcinski2015-07-063-1/+20
| | | |/ / | | |/| |
| * | | | Merge branch 'settings-via-api' into 'master'Dmitriy Zaporozhets2015-07-076-0/+176
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Add tests and improve logicDmitriy Zaporozhets2015-07-062-5/+18
| | * | | Add docs and empty specs for applicaiton settings APIDmitriy Zaporozhets2015-07-064-2/+107
| | * | | API to set application settings for adminDmitriy Zaporozhets2015-07-033-0/+58
| * | | | Merge branch 'report-delete-branch-error-codes' into 'master'Dmitriy Zaporozhets2015-07-063-2/+29
| |\ \ \ \
| | * | | | Return 40x error codes if branch could not be deleted in UIStan Hu2015-07-063-2/+29
| |/ / / /
| * | | | Merge branch 'graphs-branch-switching' into 'master'Stan Hu2015-07-065-16/+28
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Add ref switching support for graphsDaniel Gerhardt2015-07-065-16/+28
* | | | | Merge branch 'detail-too-many-warning' into 'master' Dmitriy Zaporozhets2015-07-071-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Detail too many warning to explain that merge will still work.Sytse Sijbrandij2015-07-061-1/+1
|/ / / /
* | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-07-064-18/+0
|\ \ \ \
| * \ \ \ Merge branch 'disable-sticky-diffs' into 'master'Dmitriy Zaporozhets2015-07-064-18/+0
| |\ \ \ \
| | * | | | Remove sticky-diff functionalitydisable-sticky-diffsDmitriy Zaporozhets2015-07-062-8/+0
| | * | | | Revert "Diff headers made sticky"Dmitriy Zaporozhets2015-07-062-10/+0
| | | |/ / | | |/| |
* | | | | Merge pull request #9430 from gitlabhq/fix-rake-test-ciDmitriy Zaporozhets2015-07-061-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Use teaspoon instead of jasmine:ciDmitriy Zaporozhets2015-07-031-1/+1
| |/ / /
* | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-07-0627-153/+259
|\ \ \ \
| * \ \ \ Merge branch 'audit_log' into 'master'Dmitriy Zaporozhets2015-07-0621-32/+144
| |\ \ \ \
| | * | | | Audit log for user authenticationValery Sizov2015-07-0621-33/+144
| * | | | | Merge branch 'add-irker-options' into 'master'Dmitriy Zaporozhets2015-07-066-121/+85
| |\ \ \ \ \
| | * | | | | Add Irker service configuration optionsStan Hu2015-07-056-121/+85
| * | | | | | Merge branch 'doc-list' into 'master'Robert Speicher2015-07-051-0/+30
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |