Commit Graph
17460 Commits
Author SHA1 Message Date
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
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
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
catatsuy 63a4dd5392 add CHANGELOG 2015-07-02 21:29:17 +09: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
Dmitriy Zaporozhets 7a94a46c30 Merge branch 'saml-troubleshooting' into 'master'
Add Troubleshooting section to SAML doc.

In response to #1898. We'll properly fix it in another MR.

See merge request !917
2015-07-02 09:16:49 +00:00
Dmitriy Zaporozhets 59950380b6 Merge branch 'disable-deploy-edit-link' into 'master'
Remove link leading to a 404 error in Deploy Keys page

### What does this MR do?

This MR removes a link that would lead an admin to believe he/she could edit a deploy key, but clicking on this link would lead to a 404.

### Screenshot

![image](https://gitlab.com/stanhu/gitlab-ce/uploads/b36cd76287d6389a09f9e0e49c1b6751/image.png)

### What are the relevant issue numbers?

Closes #1866

See merge request !923
2015-07-02 09:10:22 +00:00
Job van der Voort 8ba83cbab8 Merge branch 'creategroup' into 'master'
New document about creating a project

Added new document to GitLab Basics about creating a project

See merge request !1885
2015-07-02 08:41:19 +00:00
Dmitriy Zaporozhets 2cbf452821 Merge branch 'rs-gem-security' into 'master'
Gem updates for security issues

- sprockets (rails dependency, but we need to specify a version to pull
  in fixes)
- sass-rails (no security issues, but required an update to meet new
  sprockets version requirement)
- rest-client (coveralls dependency)

See merge request !915
2015-07-02 08:25:18 +00: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
Stan Hu 9c756f9321 Merge branch 'fix-changelog' into 'master'
Fix changelog for !767 and !794

These changes did not make it into the 7.12.0 release. The entry for
!794 is already correctly listed for 7.12.1 so it has been removed.

See merge request !920
2015-07-02 05:39:43 +00:00
karen Carias 7381a1ab5e fixed link 2015-07-01 20:26:52 -07:00
karen Carias 23ba7c2024 new document about creating a project 2015-07-01 20:23: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
Daniel Gerhardt c67edaee10 Fix changelog for !767 and !794
These changes did not make it into the 7.12.0 release. The entry for
!794 is already correctly listed for 7.12.1 so it has been removed.
2015-07-01 20:56:01 +02:00
Dmitriy Zaporozhets bbb18cc093 Mention faster merge operation inside one project
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-07-01 20:42:21 +02:00
Stan Hu 0b4b045758 Merge branch 'improve-spinach-test-for-mr-submit' into 'master'
Add an expect call to prevent random Spinach failure

This should help prevent getting the error:

```
Unable to find field "merge_request_title
```

This was happening probably because it takes some time after the "Compare branches" button is hit before the "New merge request" page showed up.

See merge request !882
2015-07-01 16:54:32 +00:00
Nicolás Reynolds 2662c7932a commit hashes are monospaced 2015-07-01 13:33:29 -03:00
Dmitriy Zaporozhets 459e6d3467 Merge branch 'refactor-can-be-merge' into 'master'
Refactor can_be_merged logic for merge request

Some refactoring after !918

cc @DouweM @rspeicher

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

See merge request !919
2015-07-01 15:45:42 +00: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
Stan Hu 8969a8235c Merge branch 'fix-multiple-ref-prefix' into 'master'
Extract the longest-matching ref from a commit path when multiple matches occur

### What does this MR do?

This MR extracts the longest-matching ref from a commit path. In cases when there are multiple refs that prefix the path, the ref name is ambiguous. Using the heuristic that the longest-matching ref seems like a sensible default.

### Why was this MR needed?

Suppose there is a branch named `release/app` and a tag named `release/app/v1.0.0`. Suppose `README.md` exists in the root directory.

Let's suppose the path passed in is `release/app/v1.0.0/README.md`. There are two possible ways to interpret the ref and path:

1. ref = `release/app`, path = `v1.0.0/README.md`
2. ref = `release/app/v1.0.0`, path = `README.md`

The crux of the issue is that there is ambiguity which one is correct; both could be real possibilities. In the current implementation of `extract_ref`, GitLab gets confused and tries neither: it uses ref = `release` and path = `app/v1.0.0/README.md`. Since the file does not exist, it returns 404.

### What are the relevant issue numbers?

Closes #1839

See merge request !859
2015-07-01 14:42:55 +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
Stan Hu 9add3e6eb5 Extract the longest-matching ref from a commit path when multiple matches occur
Closes #1839
2015-07-01 07:01:59 -07:00
Jacob Vosmaer 3603edcff4 Update CHANGELOG for 7.12.1 2015-07-01 15:59:09 +02:00
Valery Sizov 0ad63022bd Merge branch 'forking_on_gitlab_ci' into 'master'
Fix GitLab CI forking

I created MR here because gitlab.com is unreachable.

See merge request !1884
2015-07-01 12:51:16 +00:00
Douwe Maan 9e841cf1a8 Add Troubleshooting section to SAML doc. 2015-07-01 14:25:22 +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
Dmitriy Zaporozhets 2d85458ac7 Merge branch 'fix-zero-sha-lookup' into 'master'
Repository#blob_at should return nil for 00000000... sha

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

See merge request !916
2015-07-01 09:30:43 +00:00
Dmitriy Zaporozhets b096374dd5 Mention performance improvements after adding cache to some fragments
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-07-01 11:24:54 +02:00
Dmitriy Zaporozhets 15743123c9 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-07-01 11:21:40 +02:00
Dmitriy Zaporozhets 87df927f20 Merge branch 'reporter-manage-issues' into 'master'
Reporter role can manage issue tracker now

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

See merge request !908
2015-07-01 09:19:56 +00:00
Dmitriy Zaporozhets d75f16c2ec Fix commits feed button
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-07-01 11:19:07 +02:00
Dmitriy Zaporozhets baf12f45d8 Repository#blob_at should return nil for 00000000... sha
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2015-07-01 11:02:37 +02:00
Job van der Voort d18f1ce75d Merge branch 'k-devise' into 'master'
added note about Devise

Added note about the authentication gem used in GitLab

Because of question in https://groups.google.com/forum/#!topic/gitlabhq/G2rToah19-Q

See merge request !912
2015-07-01 08:46:26 +00:00
Job van der Voort 36ecc6d305 Merge branch 'commandline' into 'master'
added new doc "command line commands"

Added new doc to GitLab Basics

See merge request !1880
2015-07-01 08:28:08 +00:00
Dmitriy Zaporozhets e934a62aeb Merge branch 'cache-commits-render' into 'master'
Performance improvements after caching html fragments

* re-use event cache with other users
* cache commit fragment
* cache issue fragment in list
* cache comment parsed with markdown

See merge request !911
2015-07-01 08:19:43 +00:00