home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-11 21:56:19 +10:00
Code Issues Packages Projects Releases Wiki Activity
18,287 Commits 48 Branches 340 Tags
0a5b005da170fe81afea012b56f4810125b13ead
Commit Graph
8955 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 27a9ff8264 Merge branch 'rs-dev-issue-2372' into 'master' 
Filter by issues/merge requests without a milestone

Closes internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2372

See merge request !886
 2015-07-08 21:42:29 +00:00
Dmitriy Zaporozhets c8e9246ef6 Merge branch 'project-home-page' into 'master' 
New project home page

## Why?

Because current project page is overloaded with information

## Changes

* move activity to separate tab
* make project show page cleaner by removing redundant information
* render README as main content of project page

cc @sytses @JobV

See merge request !938
 2015-07-08 21:29:59 +00:00
Dmitriy Zaporozhets f0e1da04f0 Show last push widget on several project pages 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-07-08 23:21:35 +02:00
Dmitriy Zaporozhets 39a4bb2abd Cleanup and some test fixes after refactoring project home page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-07-08 16:55:04 +02:00
Dmitriy Zaporozhets bd08ac55c7 Recommend user to create README file for both empty and existing project 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-07-08 13:41:03 +02:00
Dmitriy Zaporozhets 17156cf909 Imrpove mobile view for project page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-07-08 13:34:05 +02:00
Dmitriy Zaporozhets 8404ab46b9 Add shortcut for project activity page 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-07-08 12:43:46 +02:00
Dmitriy Zaporozhets c2f02fc1a4 Refactor star and fork buttons 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-07-08 12:25:34 +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
Metalaka ecf26b8947 Fix Transfer project input width. 2015-07-07 22:14:49 +02: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
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
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
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
Dmitriy Zaporozhets 62c8bc22cc Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-07-07 12:59:45 +02: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 3ee3cb24d4 Allow user to filter by Issues/Merge Requests without a Milestone 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
Stan Hu 4254f09eaa Return 40x error codes if branch could not be deleted in UI 2015-07-06 09:47:22 -07: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
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
Valery Sizov 111ebe5471 Fork visibility level fix 2015-07-06 17:40:33 +03: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 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
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
Daniel Gerhardt bee3979a4a Fix redirection to home page URL for unauthorized users 
Redirection to the home page URL was broken by changing the target for
`root_url` from `DashboardController` to `RootController` in
94d3c1433d. This regression was introduced
in the 7.12.0 release.

Fixes #1916.
 2015-07-03 00:22:20 +02:00
Dmitriy Zaporozhets 7081ab1e9e Merge branch 'add-unlock-access' into 'master' 
Add support for unlocking users in admin settings

### What does this MR do?

This MR gives the ability to unlock a user from the Admin panel.

### Why was this MR needed?

If a user fails to login a certain number of times, Devise locks the user out for a certain amount of time (e.g. 10 minutes). There is no way for an admin to unlock a user if this happens (aside from editing the `locked_at` field entirely).

### Screenshots

#### Admin index page

![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/14c661d1d1f026770997b19af714c514/image.png)

#### Admin edit user page

![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/0c6f795757e5f03eeb923d818b7d6a96/image.png)

### What are the relevant issue numbers?

This replaces !288.

Closes https://github.com/gitlabhq/gitlabhq/issues/9381

See merge request !922
 2015-07-02 13:39:35 +00:00
catatsuy 87ac590078 'created_at DESC' is performed twice 
If you are already sorting in descending order in the created_at,
it is run twice when you run the .recent.
It has passed in the string 'created_at DESC'.
Ruby on Rails is directly given to the SQL.
It is a slow query in MySQL.
 2015-07-02 21:28:31 +09:00
Stan Hu 3e738e3b9a Add support for unlocking users in admin settings 
Closes https://github.com/gitlabhq/gitlabhq/issues/9381
 2015-07-02 04:22:51 -07:00
Dmitriy Zaporozhets 7c42aaa576 Merge branch 'anonymous-applications' into 'master' 
Correctly show anonymous authorized applications under Profile > Applications.

Fixes #1907.

Access tokens that were created using the ["Resource Owner Password Credentials" flow](http://doc.gitlab.com/ce/api/oauth2.html#resource-owner-password-credentials) by the user entering their username and password don't have a connected application, so the Profile > Applications page used to crash. These tokens are now rendered as "Anonymous" and can be revoked.

![Screen_Shot_2015-07-02_at_11.53.55](https://gitlab.com/gitlab-org/gitlab-ce/uploads/0fb044ce1fbf5d5e2825c3abee7763ee/Screen_Shot_2015-07-02_at_11.53.55.png)

See merge request !924
 2015-07-02 10:55:29 +00:00
Douwe Maan cd5e79e98b Correctly show anonymous authorized applications under Profile > Applications. 2015-07-02 11:53:31 +02:00
Stan Hu b643fa1603 Remove link leading to a 404 error in Deploy Keys page 
Closes #1866
 2015-07-01 22:53:52 -07:00
Darby c611b6f623 Comment box/Placeholder text redo 2015-07-01 15:49:31 -07:00
Robert Speicher 2ca7ffd094 Merge branch 'gfm-commit' into 'master' 
commit hashes are monospaced

Use a monospaced font for GFM commit and commit range references

See merge request !914
 2015-07-01 19:25:19 +00:00
Nicolás Reynolds 2662c7932a commit hashes are monospaced 2015-07-01 13:33:29 -03:00
Dmitriy Zaporozhets 2e6bbb12f8 Refactor can_be_merged logic for merge request 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-07-01 17:24:03 +02:00
Dmitriy Zaporozhets 804168e1de Merge branch 'use-rugged-for-merge' into 'master' 
Merge branches inside one repository using rugged instead of satellites

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

cc @rspeicher @DouweM

See merge request !918
 2015-07-01 15:08:41 +00:00
Dmitriy Zaporozhets d24c40ec21 Merge branches inside one repository using rugged instead of satellites 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-07-01 16:23:58 +02:00
Valery Sizov 6ede2db328 fix of GitLab CI forking 2015-07-01 13:26:45 +03:00
Dmitriy Zaporozhets f31d2aa44d Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-07-01 11:41:26 +02:00
Dmitriy Zaporozhets 98049a3e0c Merge branch 'ui-improvements' into 'master' 
UX improvements

* make atom feed on commits page smaller so it capture less attention
* open big image 400px instead of default 40px when click on user avatar

See merge request !910
 2015-07-01 09:40:44 +00:00
Dmitriy Zaporozhets 16b8a1ef04 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-07-01 11:37:22 +02:00
Douwe Maan 690aafebdb Merge branch 'group_settings_nav' into 'master' 
Fix consistency issue in sidebars of Project and Group Settings.

Fixes #2277

![before_after_group_settings_nav](https://dev.gitlab.org/gitlab/gitlabhq/uploads/370c701d0eff8f1f8e44cf954c75f2bf/before_after_group_settings_nav.png)

See merge request !1871
 2015-07-01 09:32:41 +00:00