summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Ensure `@sort` is set by set_filters_paramsrs-issue-1750Robert Speicher2015-07-081-0/+1
| | | | Closes #1750
* Merge branch 'use_teaspoon' into 'master'Achilleas Pipinellis2015-07-081-1/+1
|\ | | | | | | | | | | | | | | | | | | use teaspoon instead of jasmine:ci use teaspoon instead of jasmine:ci while launching local test see 18ef9befc0de176d6b7bf7daa3f364e38c3d768f See merge request !941
| * 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. /cc @sytses @Haydn See merge request !939
| * 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 page
| | * 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. Hi, On the **Transfer project** box of project settings page, the **Namespace** input is wider than other inputs. This PR set the `col-sm-*` css-class of the container to the same as other inputs. ## Screenshots Before ![before](https://gitlab.com/Metalaka/gitlab-ce/uploads/9b3e4ad07d1a199d3e1ee7e3ec1e5014/before.jpg) After ![after](https://gitlab.com/Metalaka/gitlab-ce/uploads/8a4e87fa73a028a9ac814bdbbc6dcab3/after.jpg) See merge request !940
| | * | | 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" See merge request !937
| | * | | 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 restore We were using hacks to drop tables etc during a Postgres backup restore. With this change, we let pg_dump insert the DROP TABLE statements it needs at the start of the SQL dump. See merge request !1891
| * | | | | Use native Postgres database cleaning during backup restoreJacob Vosmaer2015-07-074-25/+3
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | We were using hacks to drop tables etc during a Postgres backup restore. With this change, we let pg_dump insert the DROP TABLE statements it needs at the start of the SQL dump.
* | | | | Merge branch 'create-group' into 'master' Job van der Voort2015-07-076-1/+46
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | New doc about creating groups I added a new document about creating groups in GitLab. I also fixed comment in previous MR https://dev.gitlab.org/gitlab/gitlabhq/merge_requests/1885 See merge request !1886
| * | | | | 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
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | Conflicts: doc/install/requirements.md
| * | | | | 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 backup Restore handles both cases: uncompressed and compressed backup. As an improvement `IO.popen` can be used. /cc @jacobvosmaer See merge request !873
| | * | | | Compress database backupKamil Trzcinski2015-07-063-1/+20
| | | |/ / | | |/| |
| * | | | Merge branch 'settings-via-api' into 'master'Dmitriy Zaporozhets2015-07-076-0/+176
| |\ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | API to set application settings for admin Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !934
| | * | | Add tests and improve logicDmitriy Zaporozhets2015-07-062-5/+18
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | | Add docs and empty specs for applicaiton settings APIDmitriy Zaporozhets2015-07-064-2/+107
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | | API to set application settings for adminDmitriy Zaporozhets2015-07-033-0/+58
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | 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 UI ### What does this MR do? This MR makes `BranchesController` return the proper status code in case of a failure to delete a branch. ### Why was this MR needed? Deleting a branch would always return status 200, even if the branch could not be found or deleted for some reason. This was confusing because while trying to debug an issue with encoded slashes, it looked like the deletion was successful when it had failed. ### What are the relevant issue numbers? This issue was uncovered in #1804 See merge request !823
| | * | | | 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 graphs It is now possible to view contributor and commit statistics for refs beyond the default branch. While the Git ref already was part of the path it has not been used before. Additionally, the code in RefsController#switch has been slighliy refactored since it would have become confusing with additional if-else branches added. See merge request !932
| | * | | Add ref switching support for graphsDaniel Gerhardt2015-07-065-16/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is now possible to view contributor and commit statistics for refs beyond the default branch. Additionally, conditions in RefsController#switch have been refactored in order that a `case` block is used now.
* | | | | 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. See merge request !1889
| * | | | 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
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disable sticky diffs Revert feature introduced in https://github.com/gitlabhq/gitlabhq/pull/8760 Why? * It has unfixed bug for long time which is really annoying - https://github.com/gitlabhq/gitlabhq/pull/8760 * I was not able to properly fix it * It affected performance in bad way See merge request !935
| | * | | | Remove sticky-diff functionalitydisable-sticky-diffsDmitriy Zaporozhets2015-07-062-8/+0
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| | * | | | Revert "Diff headers made sticky"Dmitriy Zaporozhets2015-07-062-10/+0
| | | |/ / | | |/| | | | | | | | | | | | This reverts commit af44c65030a1fbc4e29c3cf51e4d3c33b9666201.
* | | | | Merge pull request #9430 from gitlabhq/fix-rake-test-ciDmitriy Zaporozhets2015-07-061-1/+1
|\ \ \ \ \ | |/ / / / |/| | | | Use teaspoon instead of jasmine:ci
| * | | | Use teaspoon instead of jasmine:ciDmitriy Zaporozhets2015-07-031-1/+1
| |/ / / | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | 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 authentication https://dev.gitlab.org/gitlab/gitlabhq/issues/2318 See merge request !931
| | * | | | 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 options ### What does this MR do? This MR makes a number of hard-coded Irker parameters configurable in the service settings: Irker server host, port, and default IRC URI. It also removes the "max recipient" limit since the recipient list is configurable only by the project owner, and it makes no sense to update the limit when it is implied in the recipient list already. ### Why was this MR needed? The existing service assumed that gitlab.com was running an Irker daemon on `localhost` when it was not. Using Irker on gitlab.com thus did not work at all. This MR allows users to provide their own Irker daemons. ### Are there points in the code the reviewer needs to double check? My main concern is whether allowing a user to specify the server/port combination would have security implications for a host. Given that HipChat and Slack allow users to do this, I didn't think this was doing anything novel. ### What are the relevant issue numbers? * Closes #1713 * Closes #1714 * Closes gitlab-com/support-forum#139 ### Screenshots ### Before ![image](https://gitlab.com/stanhu/gitlab-ce/uploads/2eb3eb815e249e9fb669fc97ecd4f3c8/image.png) ### After ![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/cceaba951c05bd3df2c842cc68046b87/image.png) See merge request !930
| | * | | | | Add Irker service configuration optionsStan Hu2015-07-056-121/+85
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #1713 Closes #1714 Closes gitlab-com/support-forum#139
| * | | | | | Merge branch 'doc-list' into 'master'Robert Speicher2015-07-051-0/+30
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Improve documentation of lists in Markdown See merge request !899
| | * | | | | Improve documentation of lists in MarkdownRaniere Silva2015-07-031-0/+30
| | | | | | |