Commit Graph
17502 Commits
Author SHA1 Message Date
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 77fb7e078e Fix db schema
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-07-08 12:49:06 +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
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
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
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
Jacob Vosmaer 570fd9f590 Add 7.12.2 CHANGELOG entries 2015-07-03 16:18:06 +02:00
Jacob Vosmaer 26172aeeae Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-07-03 16:17:02 +02:00
Stan Hu 50a04bdc28 Merge branch 'api-user-blocking' into 'master'
Allow user to be blocked and activated via the API

When authenticating against LDAP if a user has been disabled in LDAP they can no longer log on to the website or commit over http(s) but will be able to commit using any ssh keys.  This functionality allows us to look for users in GitLab that no longer exist in LDAP and disable then in GitLab.

Closes Feedback item: [Add administrative API call to block users](http://feedback.gitlab.com/forums/176466-general/suggestions/4098632-add-administrative-api-call-to-block-users)

See merge request !587
2015-07-03 13:46:29 +00:00
Steve Norman b3a751112d Allow user to be blocked and unblocked via the API 2015-07-03 11:17:57 +00:00
Dmitriy Zaporozhets 18ef9befc0 Use teaspoon instead of jasmine:ci
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-07-03 10:51:44 +02:00
Sytse Sijbrandij 49749169e9 Merge branch 'contributing-gitlab-cloud-outdated' into 'master'
Changed the reference from gitlab cloud to gitlab.com because it was outdated.

This one confused me a bit because i was searching for gitlab cloud and the first thing i saw: "It's gone and now it's gitlab.com"
So to prevent anyone other than me from being a bit puzzled this little change should help

See merge request !929
2015-07-03 07:00:27 +00:00
Markus Mauksch d9b5ff0cf3 [ci skip] Changed the reference from gitlab cloud to gitlab.com because it was outdated. 2015-07-03 03:13:41 +02:00
Robert Speicher 4e37f761bd Merge branch 'fix-homepage-redirection' into 'master'
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.

See merge request !928
2015-07-03 00:02:30 +00: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
Job van der Voort 6646a04d4c Merge branch 'create-final-rc' into 'master'
Change RC/final package release timing

Creating the packages one day before the release feels strange, especially in a month like this (June 2015) where the release is on a Monday.

I think it is better to have one more RC.

See merge request !1873
2015-07-02 17:04:02 +00:00
Dmitriy Zaporozhets a6a0792e9d Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-07-02 16:08:21 +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
Hannes Rosenögger d2f903c2d0 Merge branch 'feature/recent_order' into 'master'
'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.

See merge request !825
2015-07-02 13:27:02 +00:00