- 06 7月, 2015 1 次提交
-
-
由 Dmitriy Zaporozhets 提交于
This reverts commit af44c650.
-
- 02 7月, 2015 21 次提交
-
-
由 Dmitriy Zaporozhets 提交于
-
由 Dmitriy Zaporozhets 提交于
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
-
由 Hannes Rosenögger 提交于
'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
-
由 catatsuy 提交于
-
由 catatsuy 提交于
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.
-
由 Stan Hu 提交于
Closes https://github.com/gitlabhq/gitlabhq/issues/9381
-
由 Dmitriy Zaporozhets 提交于
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
-
由 Douwe Maan 提交于
-
由 Dmitriy Zaporozhets 提交于
Add Troubleshooting section to SAML doc. In response to #1898. We'll properly fix it in another MR. See merge request !917
-
由 Dmitriy Zaporozhets 提交于
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
-
由 Job van der Voort 提交于
New document about creating a project Added new document to GitLab Basics about creating a project See merge request !1885
-
由 Dmitriy Zaporozhets 提交于
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
-
由 Stan Hu 提交于
Closes #1866
-
由 Stan Hu 提交于
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
-
由 karen Carias 提交于
-
由 karen Carias 提交于
-
由 Robert Speicher 提交于
commit hashes are monospaced Use a monospaced font for GFM commit and commit range references See merge request !914
-
由 Daniel Gerhardt 提交于
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.
-
由 Dmitriy Zaporozhets 提交于
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-
由 Stan Hu 提交于
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
-
由 Nicolás Reynolds 提交于
-
- 01 7月, 2015 18 次提交
-
-
由 Dmitriy Zaporozhets 提交于
Refactor can_be_merged logic for merge request Some refactoring after !918 cc @DouweM @rspeicher Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !919
-
由 Dmitriy Zaporozhets 提交于
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-
由 Dmitriy Zaporozhets 提交于
Merge branches inside one repository using rugged instead of satellites Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> cc @rspeicher @DouweM See merge request !918
-
由 Stan Hu 提交于
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
-
由 Dmitriy Zaporozhets 提交于
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-
由 Stan Hu 提交于
Closes #1839
-
由 Jacob Vosmaer 提交于
-
由 Valery Sizov 提交于
Fix GitLab CI forking I created MR here because gitlab.com is unreachable. See merge request !1884
-
由 Douwe Maan 提交于
-
由 Valery Sizov 提交于
-
由 Dmitriy Zaporozhets 提交于
-
由 Dmitriy Zaporozhets 提交于
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
-
由 Dmitriy Zaporozhets 提交于
-
由 Douwe Maan 提交于
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
-
由 Dmitriy Zaporozhets 提交于
Repository#blob_at should return nil for 00000000... sha Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !916
-
由 Dmitriy Zaporozhets 提交于
Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-
由 Dmitriy Zaporozhets 提交于
-
由 Dmitriy Zaporozhets 提交于
Reporter role can manage issue tracker now Signed-off-by: NDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !908
-