Commit Graph
18287 Commits
Author SHA1 Message Date
Kamil Trzcinski 2b5007245a Added data volumes to Dockerfile 2015-07-06 16:42:52 +02:00
Valery Sizov 111ebe5471 Fork visibility level fix 2015-07-06 17:40:33 +03: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
karen Carias fef2e24804 new doc about creating groups 2015-07-02 12:09:06 -07: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
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
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
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