home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-11 13:46:11 +10:00
Code Issues Packages Projects Releases Wiki Activity
18,287 Commits 48 Branches 340 Tags
0a5b005da170fe81afea012b56f4810125b13ead
Commit Graph
18287 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Ben Bodenmiller 9bb5249994 dont -> don't 
Update "You dont have any authorized applications" to "You don't have any authorized applications"
 2015-07-07 11:31:47 -07:00
Jacob Vosmaer 0194dd4182 Add tests for custom backup archive file permissions 2015-07-07 19:03:29 +02: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
Dmitriy Zaporozhets 5be6cbac6f Add spacing around buttons on project page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-07-07 16:54:52 +02:00
Dmitriy Zaporozhets bc3cd44ba7 Add download button to project page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-07-07 16:53:25 +02: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
Dmitriy Zaporozhets d192f921c1 Move project activity to separate tab. Add more features to project home page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-07-07 16:01:12 +02: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
Dmitriy Zaporozhets 5e7f7f8d31 Redesign project home page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-07-07 15:22:56 +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
Kamil Trzcinski b8c9c69e5a Markdown fix 2015-07-07 14:03:18 +02:00
Sytse Sijbrandij d8c9d94817 Add link to multiple app servers. 2015-07-07 12:00:48 +00:00
Kamil Trzcinski ea7b31002e Add note about HTTPS 2015-07-07 13:06:41 +02: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
Kamil Trzcinski 7a3b47ff47 Fix port issue 2015-07-07 12:57:43 +02: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
Robert Speicher cf7c57aaf5 Use stub_application_setting in a few more specs 
These specs also failed when run by themselves before this change, so
we've likely got some kind of cross-test contamination going on.
 2015-07-06 22:39:56 -04:00
Robert Speicher 4b4351a18c Add feature tag to feature specs 
Not to be confused with the RSpec `type: :feature` tag, this tag is used
by the `spec:feature` Rake task for filtering/grouping specs.
 2015-07-06 22:39:55 -04:00
Robert Speicher d00cb00d6b Rename NoMilestone to Milestone::None 
Also refactors IssuableFinder to avoid redundant title check.
 2015-07-06 22:39:55 -04:00
Robert Speicher cfd813402d Remove duplicate feature spec for filtering issues by no milestone 2015-07-06 22:39:55 -04:00
Robert Speicher 3ee3cb24d4 Allow user to filter by Issues/Merge Requests without a Milestone 2015-07-06 22:39:55 -04:00
Robert Speicher ea565653a0 Bump capybara to 2.4.0 2015-07-06 22:39:55 -04:00
Robert Speicher 9e53ad5e20 Bump select2-rails version 2015-07-06 22:39:55 -04: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
Jacob Vosmaer bb50b7fcd0 Allow custom backup archive permissions 
This change helps system administrators who want to replicate
GitLab backup files without needing root permissions.
 2015-07-06 18:43:17 +02: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
Kamil Trzcinski e906008eb8 Fix port 80443 => 8443 2015-07-06 16:57:46 +02: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
Kamil Trzcinski d999e414b9 Final touches 2015-07-06 16:42:52 +02:00
Kamil Trzcinski 954c1df256 Update Docker documentation to use single container 2015-07-06 16:42:52 +02:00