Commit Graph
17516 Commits
Author SHA1 Message Date
Robert Speicher 335749d754 Ensure @sort is set by set_filters_params
Closes #1750
2015-07-08 18:17:13 -04:00
Achilleas Pipinellis d991e3e41a Merge branch 'use_teaspoon' into 'master'
use teaspoon instead of jasmine:ci

use teaspoon instead of jasmine:ci while launching local test

see 18ef9befc0

See merge request !941
2015-07-08 19:01:59 +00:00
Francesco Coda Zabetta 6d56bd8690 use teaspoon instead of jasmine for testing javascript 2015-07-08 17:46:51 +02:00
Job van der Voort ad12c1264d Merge branch 'add-ie-compat-notice' into 'master'
Added info about common UI problems if IE Compatibility View mode is enabled.

/cc @sytses @Haydn

See merge request !939
2015-07-08 09:32:23 +00:00
Jacob Vosmaer 0c4d923cad Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-07-08 11:20:14 +02:00
Jacob Vosmaer deb487ec1f Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-07-08 11:06:17 +02:00
Robert Schilling e21bd9490c Merge branch 'patch-1' into 'master'
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
2015-07-08 06:53:46 +00:00
Robert Schilling 854679cb80 Merge branch 'fix-irker-capitalization' into 'master'
Change "Irc Uri" -> "IRC URI"

See merge request !937
2015-07-08 06:52:28 +00:00
Dmitriy Zaporozhets b9452d7bcd Merge branch 'improve-postgres-restore-cleaning' into 'master'
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
2015-07-07 23:02:48 +00:00
Metalaka ecf26b8947 Fix Transfer project input width. 2015-07-07 22:14:49 +02:00
Job van der Voort 8b1065019a Merge branch 'create-group' into 'master'
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
2015-07-07 20:14:07 +00:00
karen Carias cddbbc819c fixed text 2015-07-07 12:49:58 -07:00
Sytse Sijbrandij 75e33e23d1 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
Conflicts:
	doc/install/requirements.md
2015-07-07 18:23:11 +02:00
Sytse Sijbrandij 540656f9ec Specify that swap will be slow. 2015-07-07 18:20:43 +02:00
Patricio Cano ddb1836f93 Added info about common UI problems if IE Compatibility View mode is enabled. 2015-07-07 11:08:29 -05:00
karen Carias 943217a122 fixed typo 2015-07-07 07:09:37 -07:00
karen Carias afe5069551 fixed image 2015-07-07 07:06:02 -07:00
karen Carias bf0b3fcb89 fixed document with improved instructions 2015-07-07 06:58:42 -07:00
Jacob Vosmaer 90ab5a59bb 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.
2015-07-07 15:34:06 +02:00
Stan Hu 954eedf368 Change "Irc Uri" -> "IRC URI" 2015-07-07 05:48:32 -07:00
stanhu 5f4ec60024 Merge pull request #9435 from bbodenmiller/patch-1
use relative link to SSH setup page
2015-07-07 05:44:06 -07:00
Sytse Sijbrandij d8c9d94817 Add link to multiple app servers. 2015-07-07 12:00:48 +00:00
Dmitriy Zaporozhets 62c8bc22cc Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-07-07 12:59:45 +02:00
Kamil Trzciński 474d798c42 Merge branch 'compress-db' into 'master'
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
2015-07-07 10:58:27 +00:00
Dmitriy Zaporozhets f76092c06d Merge branch 'settings-via-api' into 'master'
API to set application settings for admin

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

See merge request !934
2015-07-07 10:57:41 +00:00
Dmitriy Zaporozhets faa535ecdf Merge branch 'detail-too-many-warning' into 'master'
Detail too many warning to explain that merge will still work.



See merge request !1889
2015-07-07 07:50:58 +00:00
Ben Bodenmiller f876ef6e4d use relative link to SSH setup page 2015-07-06 23:15:03 -07:00
Sytse Sijbrandij 5ee8ae4894 Detail too many warning to explain that merge will still work. 2015-07-06 22:03:36 +02:00
Dmitriy Zaporozhets 41e6b8d8d8 Merge branch 'report-delete-branch-error-codes' into 'master'
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
2015-07-06 18:42:03 +00:00
Stan Hu 4254f09eaa Return 40x error codes if branch could not be deleted in UI 2015-07-06 09:47:22 -07:00
Kamil Trzcinski 69c659ebd3 Compress database backup 2015-07-06 17:14:17 +02:00
Stan Hu e2190115e8 Merge branch 'graphs-branch-switching' into 'master'
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
2015-07-06 15:12:24 +00:00
Dmitriy Zaporozhets 603ceea21a Add tests and improve logic
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-07-06 16:47:19 +02:00
Daniel Gerhardt 2963e7fd1c Add ref switching support for graphs
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.
2015-07-06 16:44:30 +02:00
Dmitriy Zaporozhets 17446ff0c9 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-07-06 15:54:38 +02:00
Dmitriy Zaporozhets b28714b6a9 Add docs and empty specs for applicaiton settings API
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-07-06 15:53:08 +02:00
Dmitriy Zaporozhets b2e2444436 Merge pull request #9430 from gitlabhq/fix-rake-test-ci
Use teaspoon instead of jasmine:ci
2015-07-06 15:50:37 +02:00
Dmitriy Zaporozhets 99c3b112fa Merge branch 'disable-sticky-diffs' into 'master'
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
2015-07-06 13:23:32 +00:00
Dmitriy Zaporozhets 1165d3dce1 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-07-06 12:11:54 +02:00
Dmitriy Zaporozhets f3590c83ea Merge branch 'audit_log' into 'master'
Audit log for user authentication

https://dev.gitlab.org/gitlab/gitlabhq/issues/2318

See merge request !931
2015-07-06 10:09:53 +00:00
Valery Sizov 411829fdb5 Audit log for user authentication 2015-07-06 12:36:08 +03:00
Dmitriy Zaporozhets 9860ab0f22 Remove sticky-diff functionality
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-07-06 11:34:37 +02:00
Dmitriy Zaporozhets 919e702c86 Revert "Diff headers made sticky"
This reverts commit af44c65030.
2015-07-06 11:30:30 +02:00
Dmitriy Zaporozhets 5f52d6a038 Merge branch 'add-irker-options' into 'master'
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
2015-07-06 08:57:16 +00:00
Job van der Voort 1d50099b68 Merge branch 'k-fix-link' into 'master'
fixed link to gitlab-basics

Fixed link to gitlab-basics

See merge request !1887
2015-07-06 05:53:17 +00:00
Robert Speicher a4c4e7a77e Merge branch 'doc-list' into 'master'
Improve documentation of lists in Markdown

See merge request !899
2015-07-05 18:58:18 +00:00
karen Carias 04f5487b0d fixed link to gitlab-basics 2015-07-05 08:23:09 -07:00
Stan Hu d4be82d1c9 Add Irker service configuration options
Closes #1713
Closes #1714
Closes gitlab-com/support-forum#139
2015-07-05 06:40:56 -07:00
Raniere Silva b348ff1a10 Improve documentation of lists in Markdown 2015-07-03 15:27:24 -03:00
Dmitriy Zaporozhets c2ee6862c8 API to set application settings for admin
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-07-03 16:50:21 +02:00