Commit Graph
22431 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets 701e9ee451 Merge branch 'rs-omniauth-client-versions' into 'master'
Add versions to omniauth_crowd and omniauth-azure-oauth2

Also sorts them alphabetically, because OCD.

See merge request !2364
2016-01-11 15:32:39 +00:00
Dmitriy Zaporozhets 5500f9159f Merge branch 'group-issues-sorting' into 'master'
Improve performance of getting issues on group level

For testing I used the URL http://localhost:3000/groups/gitlab-org/issues?milestone_title=8.1. Prior to these changes said URL would take about 10-12 seconds to load. By applying these changes the loading time has been reduced to roughly 2-3 seconds. 

There's still some stuff going on in some views that I have to look at, resolving those changes might reduce the loading time a bit more. I also still have to check if I didn't break too many tests.

Fixes: gitlab-org/gitlab-ce#3707 gitlab-org/gitlab-ce#4071 

See merge request !2318
2016-01-11 15:28:41 +00:00
Dmitriy Zaporozhets 1ede18bfa8 Merge branch 'rs-woff-fonts' into 'master'
Use WOFF versions of SourceSansPro

See https://gitlab.com/gitlab-org/gitlab-ce/issues/6023

See merge request !2357
2016-01-11 14:25:25 +00:00
Dmitriy Zaporozhets a9800ce40b Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2016-01-11 15:04:18 +01:00
Douwe Maan 66dee188d8 Merge branch 'rs-zenmode-cleanup' into 'master'
Refactor ZenMode

- No longer depends on the "hidden checkbox".
- No longer depends on manually storing/restoring the scroll position.
  Instead, we take advantage of jquery.scrollTo.
- Event-based.
- Simplifies the state-based styling.

See merge request !2354
2016-01-11 13:50:30 +00:00
Douwe Maan d89ad5078d Merge pull request #9960 from huacnlee/fix/do-not-use-coffeescript-in-erb
use JavaScript instead of CoffeeScript in Views for master
2016-01-11 14:31:55 +01:00
Dmitriy Zaporozhets f41b535ced Merge branch 'fix-build-status-caching' into 'master'
Fix caching issue where build status was not updating in project dashboard

The project dashboard page would show a stale build status since the caching key did not depend on it. Fix by adding the commit status if CI is applicable.

Closes #3268

See merge request !2353
2016-01-11 12:10:33 +00:00
Dmitriy Zaporozhets 57a4319d42 Merge branch 'load-autocomplete-when-needed' into 'master'
Only load autocomplete data when actually needed



See merge request !2365
2016-01-11 11:58:45 +00:00
Kamil Trzciński b6c2908cb2 Merge branch 'fix-build-page-typo' into 'master'
Fix typo in build page of projects

The column containing links to the builds is named Runner but actually
contains the Build.

See merge request !2347
2016-01-11 11:54:18 +00:00
Achilleas Pipinellis 5270cc6958 Merge branch 'doc-update' into 'master'
Update docs for shared runner default settings

GitLab 8.2 updated shared runners to default to `ENABLED` on all projects.

Fixes #5993

See merge request !2358
2016-01-11 11:32:10 +00:00
Yorick Peterse 569f5701ee Only load autocomplete data when actually needed
Previously this would result in autocomplete data being loaded for every
page (e.g. the page showing all Git branches of a project).
2016-01-11 11:13:11 +01:00
Dmitriy Zaporozhets ce066ba630 Merge branch 'autocomplete-on-load' into 'master'
Load autocomplete data when loading an issue page



See merge request !2312
2016-01-11 09:42:37 +00:00
Dmitriy Zaporozhets e9f84c4c8c Merge branch 'new-branch-position-fix' into 'master'
fixes new branch button positioning, when visible and not visible container

Fixes #5893
#5893 was not completely fixed. If a new branch was pushed the container is in correct position but if no container existed the position was incorrect. This MR fixes that. 

See merge request !2348
2016-01-11 09:41:32 +00:00
Dmitriy Zaporozhets e3c024f712 Merge branch 'add-pencil-icon-to-group-page' into 'master'
Add pencil icon to edit group settings

Move icons to upper-right corner of group page

Before:

![image](/uploads/6694c33eae6e10a4e21efef465a07114/image.png)

After:

![image](/uploads/0c17c2cf89fc0fde4344911b30f2635c/image.png)

Closes #6038

See merge request !2361
2016-01-11 09:40:33 +00:00
Dmitriy Zaporozhets e04e957bd6 Merge branch 'fix-duplicate-branch-activity' of https://gitlab.com/stanhu/gitlab-ce 2016-01-11 10:17:27 +01:00
Jeroen Nijhof 17f6a916d0 Merge branch 'master' into 'master'
Added housekeeping for git repositories

This merge request will add a housekeeping button in the project setting page which invoke the gitlab shell to run a `git gc` in the project repository.

see gitlab-org/gitlab-ce#3041

Depends on gitlab-org/gitlab-shell!23 which has been merged.


See merge request !1658
2016-01-11 09:13:53 +00:00
Jeroen Nijhof 706255b926 Merge gitlab.com:gitlab-org/gitlab-ce 2016-01-11 09:32:35 +01:00
Stan Hu 1587d57197 Check for current user 2016-01-10 20:46:57 -08:00
Stan Hu f394ccd584 Merge branch 'Issue#5817' into 'master'
Issue#5817 Improve wording of the web hooks page on the project's setting

Merge Request !2362 had  a typo, I'm resubmitting the merge request about issue #5817.

See merge request !2363
2016-01-11 04:28:46 +00:00
Stan Hu 8aac39d836 Add pencil icon to edit group settings
Move icons to upper-right corner of group page

Closes #6038
2016-01-10 20:27:25 -08:00
Stan Hu af9bbadc4c Merge branch 'check-for-present-runner-token' into 'master'
Fix Error 500 when visiting build page of project with nil runners_token

Properly ensure that the token exists and add defensively check for a
non-nil value.

Closes #4294

See merge request !2294
2016-01-11 03:42:00 +00:00
iqualisoni e304a76eb6 Issue #5817 wording of the web hooks updated on issue and merge events 2016-01-11 01:02:27 -02:00
Jason Lee a789dcaeb3 use JavaScript instead of CoffeeScript in Views, the reason #9819 2016-01-11 11:01:15 +08:00
Stan Hu b7aa13a0cf Before project save ensure that a runners_token exists 2016-01-10 18:12:47 -08:00
Stan Hu 4b4fdf58c7 Fix Error 500 when visiting build page of project with nil runners_token
Properly ensure that the token exists and add defensively check for a
non-nil value.

Closes #4294
2016-01-10 18:12:47 -08:00
Robert Speicher 0f2e4198ec Add versions to omniauth_crowd and omniauth-azure-oauth2
Also sorts them alphabetically, because OCD.
2016-01-10 20:43:41 -05:00
Robert Speicher 70cba8e9a8 Remove outdated gitlab-git-http-server reference from Install doc
[ci skip]
2016-01-10 19:59:40 -05:00
Robert Speicher 4de89291a3 Merge branch 'fix_jira_shortterm' into 'master'
Do not call API if there is no API URL

Fixes #5878 

CE users may not be interested in the new JIRA features. In this case,
we should detect they haven't set an API URL and fallback to the
behavior pre-8.3. This patch does that very easily.

There are planned improvements to JIRA in future releases such as
gitlab-org/gitlab-ce#5541 which will make this more configurable.

See merge request !2341
2016-01-10 22:12:10 +00:00
Robert Speicher efaa4e2386 Merge branch 'update-changelog-with-email-reply-fix' into 'master'
Add CHANGELOG entry for reply-by-email fix

[ci skip]

See merge request !2359
2016-01-10 22:10:25 +00:00
Steffen Köhler 9061b55c17 Fix typo in build page of projects
The column containing links to the builds is named Runner but actually
contains the Build ID.

[ci skip]
2016-01-10 16:20:51 +01:00
Luke Waite e6dbbafd0a Update docs for shared runner default settings
Fixes #5993
2016-01-10 08:29:50 -05:00
Robert Speicher be76e402f9 Merge branch 'disable-blocked-in-abuse-reports' into 'master'
Disable "Already Blocked" button in admin abuse report page

See merge request !2360
2016-01-10 09:55:16 +00:00
Stan Hu 5f6b093445 Disable "Already Blocked" button in admin abuse report page 2016-01-09 21:25:18 -08:00
Stan Hu a8b444953b Add CHANGELOG entry for reply-by-email fix
[ci skip]
2016-01-09 17:08:49 -08:00
Robert Speicher c7aeca993e Use WOFF versions of SourceSansPro
See https://gitlab.com/gitlab-org/gitlab-ce/issues/6023
2016-01-09 16:05:53 -05:00
Achilleas Pipinellis c81647ae8c Merge branch 'doc_clean_up_add_users' into 'master'
Clean up document on adding users to a project

Closes #3093, #3648

See merge request !2356
2016-01-09 10:10:05 +00:00
Achilleas Pipinellis 11b4c0d3cf Clean up document on adding users to a project
[ci skip]
2016-01-09 11:03:10 +01:00
Robert Speicher 89ca4f04f6 Refactor ZenMode
- No longer depends on the "hidden checkbox".
- No longer depends on manually storing/restoring the scroll position.
  Instead, we take advantage of jquery.scrollTo.
- Event-based.
- Simplifies the state-based styling.
2016-01-08 23:36:09 -05:00
Stan Hu d5c8f1fdde Fix caching issue where build status was not updating in project dashboard
Closes #3268
2016-01-08 16:08:10 -08:00
Robert Speicher 6d95444108 Merge branch 'cross-project-reference-typo-fix' into 'master'
changes verb `references` to noun `reference`.

See merge request !2349
2016-01-08 22:14:31 +00:00
Robert Speicher 00a68c3cb0 Remove Block Button from Abuse Reports page if User is Already Blocked
An addition to https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2292

Related to https://gitlab.com/gitlab-org/gitlab-ce/issues/4667

See merge request !2313
2016-01-08 22:02:34 +00:00
Robert Speicher 99eb647087 Add a CHANGELOG entry for The Most Important Feature of All Time(TM)
Also, Open Graph data, if you're into that kind of thing.

[ci skip]
2016-01-08 15:46:55 -05:00
Robert Speicher af68897acd Merge branch 'api-project-upload' into 'master'
Add API project upload endpoint

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/4317

See merge request !2329
2016-01-08 20:29:43 +00:00
Robert Speicher 6467448a1a Merge branch 'blacklist-new' into 'master'
Add 'new' as a reserved namespace name

Closes #5930

See merge request !2344
2016-01-08 18:27:22 +00:00
Jacob Schatz b284ba24c2 changes verb references to noun reference. 2016-01-08 13:08:57 -05:00
Jacob Schatz 463905929e fixes new branch button positioning, when visible and not visible container 2016-01-08 12:48:11 -05:00
Stan Hu 7403df6ca7 Merge branch 'suppress-allow-failure-builds' into 'master'
Suppress e-mails on failed builds if allow_failure is set

Every time I push to GitLab, I get > 2 emails saying a spec failed when I don't care about the benchmarks and others that have `allow_failure` set to `true`.

@ayufan mentioned creating a summary e-mail to prevent getting one e-mail per build, but the latter might actually be desirable. For example, I do want to know if Rubocop errors fail right away.

See merge request !2178
2016-01-08 17:31:35 +00:00
Douwe Maan 0614793b38 DRY up upload and download services 2016-01-08 17:38:53 +01:00
Douwe Maan 8429f6f409 Merge branch 'rs-single-item-task-list-spec' into 'master'
Add spec for single-item task lists

Follow-up to https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2330

See merge request !2340
2016-01-08 16:33:57 +00:00
Jeroen Nijhof e0436005af Merge gitlab.com:gitlab-org/gitlab-ce 2016-01-08 17:25:09 +01:00