Commit Graph
24479 Commits
Author SHA1 Message Date
Alfredo Sumaran eed8b179b6 Handle default tab 2016-02-29 19:12:06 -05:00
Alfredo Sumaran c6b27550c8 Let User class handle resource loading 2016-02-29 19:10:11 -05:00
Alfredo Sumaran 4c4d742431 Activities will load when the according tab is opened 2016-02-29 19:09:16 -05:00
Alfredo Sumaran 2888cc93bd Select just the first matched element
This a generic selector. It was also affecting spinner icon of the tabs
2016-02-29 19:08:11 -05:00
Alfredo Sumaran b522ef4b69 Respond to .json requests 2016-02-29 16:40:57 -05:00
Alfredo Sumaran 703ea298d6 Tidy html 2016-02-29 16:40:34 -05:00
Alfredo Sumaran 237290bcc4 Add ul to wrap project list 2016-02-29 16:39:40 -05:00
Alfredo Sumaran 97400ef852 Handle user tabs 2016-02-29 16:39:20 -05:00
Alfredo Sumaran d941aee400 Create user_tabs.js.coffee 2016-02-29 16:39:09 -05:00
Alfredo Sumaran 99d75a2770 Delete unnecesary script 2016-02-29 16:36:05 -05:00
Josh Frye cc9f93f9d2 Add routes and actions for dynamic tab loading 2016-02-29 08:24:07 -05:00
Douwe Maan cd391b66e9 Merge branch 'rs-data-links' into 'master'
Sanitize `data` and `vbscript` links

Closes #13625 

Closes https://dev.gitlab.org/gitlab/gitlabhq/issues/2660

See merge request !2905
2016-02-29 13:22:38 +00:00
Douwe Maan 2ea8f71bb4 Merge branch '11489-branded-appearance-to-ce' into 'master'
Branded appearance to CE

Closes #11489 

The difference with the EE version is only that there is no distinction between light and dark logos, though this wasn't used anyway. If this is fine, I'll create a MR on EE too.

TODO:
- [x] Copy docs
- [x] Make new screenshots
- [ ] Remove Custom Welcome message feature?

@rymai: I was unsure what labels to add to ping you, so I just ping you like this 😉 

/cc @DouweM

See merge request !2927
2016-02-29 13:18:29 +00:00
Douwe Maan a297e44048 Merge branch 'issue_13621' into 'master'
Don't repeat labels listed on Labels tab.

Fixes #13622 

See merge request !2924
2016-02-29 13:16:00 +00:00
Achilleas Pipinellis 9a7690f9e2 Merge branch 'ci_examples' into 'master'
Improve discoverability for CI examples

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/13410

See merge request !3008
2016-02-29 12:54:28 +00:00
Achilleas Pipinellis 9e3c78724b Link to examples page
[ci skip]
2016-02-29 14:50:08 +02:00
Achilleas Pipinellis f742ddeebe Reorganize CI sections and give descriptive names to links 2016-02-29 14:44:08 +02:00
Achilleas Pipinellis e1e6dd76f5 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ci_examples 2016-02-29 13:31:17 +02:00
Douwe Maan 17251cf447 Merge branch 'rs-development-docs' into 'master'
Add "Gotchas" to development docs

Also:

- Alphabetizes the "Developer" index page
- Fixes the broken `db_dump.md` link

See merge request !2846
2016-02-29 11:00:33 +00:00
Robert Speicher f838dbe4d1 Update CHANGELOG
[ci skip]
2016-02-27 19:27:57 -05:00
Achilleas Pipinellis 47ae0c370b Merge branch '13679-fix' into 'master'
Adjust documentation of permissions

## What does this MR do?
This MR improves the documentation of the permissions by mentioning that internal projects do not enforce the Guest role.
## Are there points in the code the reviewer needs to double check?
No code was touched - only the documentation was adjusted.
## Why was this MR needed?
Without this adjustment it might not be clear how you can set up an internal project to be pullable by everyone whilst having the issue tracker and labels managed by permitted people only.
## What are the relevant issue numbers?
#13679 

See merge request !2925
2016-02-27 23:26:33 +00:00
Thomas Schmidt d324c67db3 Adjust documentation of permissions
[ci skip]
2016-02-27 23:26:04 +01:00
Robert Speicher 65040978db Merge branch 'rs-fix-issue-filter-spec' into 'master'
Fix issue milestone filter spec

See merge request !2990
2016-02-27 21:38:13 +00:00
Robert Speicher 20ac35e924 Merge branch 'evuez/gitlab-ce-webhook-url-spaces' into 'master'
Strip leading and trailing spaces in URL validator

_Originally opened at !2914 by @evuez._

It makes URLs in webhooks valid even if they contain leading and/or trailing spaces.

Spaces are hard to notice in input fields, this helps users by accepting leading and trailing spaces in webhooks URLs.

Fixes #13652

See merge request !2939
2016-02-26 23:35:43 +00:00
Robert Speicher 4fcaa7a474 Fix issue milestone filter spec 2016-02-26 18:14:49 -05:00
Robert Speicher 2c6e34bc16 Merge branch 'repository-caching-refactor' into 'master'
Refactor Repository Caching

Related issue: https://gitlab.com/gitlab-org/gitlab-ce/issues/13515

See merge request !2936
2016-02-26 22:07:50 +00:00
Achilleas Pipinellis cbd9f1bc09 Move languages to examples 2016-02-26 22:51:07 +02:00
evuezandRobert Speicher 4d0e2979b9 Allow webhooks URL to have leading and trailing spaces 2016-02-26 14:34:06 -05:00
Jacob Schatz 01160fc061 Merge branch 'avatar-cropping' into 'master'
Fix avatar stretching by providing a cropping feature

Originally by @nesk at https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2773

Fixes #7959

See merge request !2951
2016-02-26 17:56:24 +00:00
Alfredo Sumaran dead4f2906 Update CHANGELOG 2016-02-26 12:30:40 -05:00
Rémy Coutable 4bff9daf8b Merge branch 'sidebar-hide-class' into 'master'
Created helper class to hide content in issue sidebar when collapsed

![Screen_Shot_2016-02-25_at_10.38.39](/uploads/ca49cc230edf7e71b7726e905f523092/Screen_Shot_2016-02-25_at_10.38.39.png)

Closes #13764

See merge request !2968
2016-02-26 16:42:25 +00:00
Kamil Trzciński baa5f7fc25 Merge branch 'feature/slacky-builds-v2' into 'master'
Add builds URL to gitlab-ci script

Add builds URL to gitlab-ci script

Related to: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/2681

See merge request !2962
2016-02-26 15:00:15 +00:00
Dmitriy Zaporozhets cc8b08722d Merge branch 'refactor-lists' into 'master'
Refactor html/css for lists and improve help UI page

* dry lists html/css removing a lot of style duplicates
* fix snippets list to match common style
* fix extra bottom margin for groups list
* improve help page ui so it looks clean

Fixes #11873 

See merge request !2977
2016-02-26 14:59:32 +00:00
Zeger-Jan van de Weg 9a2869ab46 Branded login page also in CE
The only major difference with the EE version is the change from a light and dark logo to only a header logo
The dark logo wasn't used anyway, so it seemed to make sense to me to rename the field to the actual function of it
2016-02-26 15:50:51 +01:00
Alfredo Sumaran 08ec838ed5 Merge branch 'master' into avatar-cropping 2016-02-26 09:32:07 -05:00
Dmitriy Zaporozhets 421aa858e1 Improve help UI page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-02-26 15:17:13 +01:00
Jacob Schatz f150b8a5b9 Merge branch 'coffeescript_syntax_error' into 'master'
Fix syntax error in autosave coffeescript.

According to http://coffeescript.org/#try , `catch` needs to have an argument.

Otherwise, `Error: Parse error on line 19: Unexpected 'INDENT'` error is raised when converting to JS by coffee-script.

Fixes gitlab-org/gitlab-ce#3302


See merge request !2985
2016-02-26 14:06:00 +00:00
Dmitriy Zaporozhets 012ea64d00 Fix description margin for groups list
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-02-26 15:02:34 +01:00
Dmitriy Zaporozhets d51f3b7b35 Refactor styles for merge requests list
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-02-26 14:48:25 +01:00
Dmitriy Zaporozhets 2b5a6487ba Refactor styles for issues list
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-02-26 14:44:39 +01:00
Dmitriy Zaporozhets 2e2b96a40d Refactor css for groups list
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-02-26 14:44:39 +01:00
Dmitriy Zaporozhets 82064a7c1a Refactor css for snippets list
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-02-26 14:44:39 +01:00
Dmitriy Zaporozhets 5a1afb48fe Cleanup css for projects list
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-02-26 14:44:39 +01:00
Marin Jankovski b2c641de21 Fix syntax error in autosave coffeescript. 2016-02-26 13:22:35 +01:00
Rémy Coutable bb3563b5cd Merge branch 'rs-crowd-form-view-spec' into 'master'
Move "I should see Crowd login form" feature to a view spec

We were doing all kinds of code gymnastics to "enable" Crowd in the
feature spec and this would sometimes cause a transient failure.

Really what it's testing is if the Crowd login form shows when Crowd's
enabled, so this is much better suited to a view spec.

See merge request !2963
2016-02-26 11:27:27 +00:00
James Lopez cc42867612 update gitlab-ci script syntax 2016-02-26 11:22:34 +01:00
James Lopez 3bc77371ba Merge remote-tracking branch 'origin/feature/slacky-builds-v2' into feature/slacky-builds-v2
# Conflicts:
#	.gitlab-ci.yml
2016-02-26 11:21:32 +01:00
James Lopez 7eacb70c15 update gitlab-ci script syntax 2016-02-26 11:20:39 +01:00
Achilleas Pipinellis 3f83d1dc3a Merge branch 'patch-1' into 'master'
Reformats confusing '[named here]' section for 3rd party code attribution

Weird formatting originally. Which of the following is the proper format for attribution?

1. Submitted on behalf of a third-party: [David Alexander]
1. Submitted on behalf of a third-party: [[] David Alexander]
1. Submitted on behalf of a third-party: [] David Alexander
1. Submitted on behalf of a third-party: [[ David Alexander ]]
1. ... _etc._

With this change, it allows for either of the following formats:

1. Submitted on behalf of a third-party: [David Alexander]
1. Submitted on behalf of a third-party: David Alexander

See merge request !2861
2016-02-26 09:28:22 +00:00
Achilleas Pipinellis f37e031bc9 Merge branch 'master' into 'master'
Add instructions for pushing tags as well as branches

Current instructions will push the svn branches but not tags  - add missing line to tags


See merge request !2778
2016-02-26 09:27:05 +00:00