home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-23 03:26:07 +10:00
Code Issues Packages Projects Releases Wiki Activity
16,715 Commits 48 Branches 340 Tags
394fe7614c3d8507b79ca41419f11bcde906ccae
Commit Graph
16715 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Dmitriy Zaporozhets 394fe7614c Merge branch 'leave-group' into 'master' 
User should be able to leave group. If not - show him proper message

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

See merge request !743
 2015-05-29 13:35:05 +00:00
Dmitriy Zaporozhets 907bbb2b05 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-05-29 15:14:48 +02:00
Dmitriy Zaporozhets d4a58c685f Style header search field on focus 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-05-29 15:14:29 +02:00
Dmitriy Zaporozhets 85de253ee1 Fix tests for group leave feature 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-05-29 15:07:04 +02:00
Dmitriy Zaporozhets cef746dc94 User should be able to leave group. If not - show him proper message 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-05-29 14:12:30 +02:00
Dmitriy Zaporozhets 4a1df710f8 Merge branch 'mr-wip-text' into 'master' 
Shorten merge request WIP text.

![Screen_Shot_2015-05-29_at_11.37.46](https://gitlab.com/gitlab-org/gitlab-ce/uploads/5853d9057103bdaacded17798378f68e/Screen_Shot_2015-05-29_at_11.37.46.png)
![Screen_Shot_2015-05-29_at_11.37.49](https://gitlab.com/gitlab-org/gitlab-ce/uploads/be96ee32ab5a8f23835dc37306259b17/Screen_Shot_2015-05-29_at_11.37.49.png)

See merge request !741
 2015-05-29 11:34:18 +00:00
Douwe Maan 70b29c3576 Merge branch 'feature/saml_support' into 'master' 
Add SAML support via Omniauth

Split of !669, with doc

See merge request !722
 2015-05-29 10:37:27 +00:00
Dmitriy Zaporozhets aa97325dea Merge branch 'rs-merge-request-tabs-the-third' into 'master' 
Include location.search and location.hash in URL for replaceState

Forgot these 😊

See merge request !740
 2015-05-29 10:23:33 +00:00
Douwe Maan d5b1c58e26 Shorten merge request WIP text. 2015-05-29 11:37:12 +02:00
Robert Speicher 7f529ef0f7 Include location.search and location.hash in URL for replaceState 2015-05-29 05:15:09 -04:00
Dmitriy Zaporozhets 2f3a11fed3 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-05-29 11:11:12 +02:00
Dmitriy Zaporozhets acb7721fe8 Merge branch 'rs-teaspoon' into 'master' 
Add Teaspoon for Javascript testing

Looking to expand our Javascript unit tests, and this gem makes things a bit better in that respect.

See https://github.com/modeset/teaspoon

See merge request !715
 2015-05-29 09:10:46 +00:00
Dmitriy Zaporozhets e11e042d89 Fix diff header with submodule change 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-05-29 11:01:40 +02:00
Dmitriy Zaporozhets ac584d6b08 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-05-29 10:57:35 +02:00
Dmitriy Zaporozhets c090ebc07e Merge branch 'rs-persist-tab-selection-more-betterer' into 'master' 
Improve MergeRequest tab-persisting behavior

Now uses the path instead of the hash.

See discussion in !728

See merge request !737
 2015-05-29 08:44:23 +00:00
Dmitriy Zaporozhets d047d299bf Merge pull request #9318 from jvanbaarsen/allow-special-chars-bio 
Allow special characters in users bio
 2015-05-29 10:41:01 +02:00
Robert Speicher 3f156ed482 Improve MergeRequest tab-persisting behavior 
Now uses the path instead of the hash.

See discussion in #728.
 2015-05-29 00:27:56 -04:00
Robert Speicher f46b367068 Add MergeRequests#commits action and route 
/:namespace_id/:project_id/merge_requests/:id/commits(.:format)
 2015-05-29 00:09:28 -04:00
Robert Speicher cef8ab4604 Bump turbolinks version 2015-05-29 00:05:14 -04:00
Robert Speicher f95eeee1d6 Merge branch 'master' into 'master' 
Remove extra brace

Extraneous curly brace creeped in prior commit.

See merge request !734
 2015-05-29 00:25:23 +00:00
Robert Speicher bd12ca5eb3 Disable Rack::MiniProfiler for /teaspoon path 2015-05-28 18:22:33 -04:00
Robert Speicher 330c25385b Update jasmine:ci task to use teaspoon 2015-05-28 18:22:33 -04:00
Robert Speicher d2256c18f4 Stub ajax in JS specs 2015-05-28 18:22:32 -04:00
Robert Speicher c9788bd9d8 Remove jasmine-fixture, use teaspoon fixtures 2015-05-28 18:22:32 -04:00
Robert Speicher 73440b0364 Javascripts don't need to require jquery or bootstrap explicitly 2015-05-28 18:22:32 -04:00
Robert Speicher d850a57ff4 teaspoon install 2015-05-28 18:22:32 -04:00
Robert Speicher 05aa71ccd9 Remove jasmine-rails; add teaspoon 2015-05-28 18:22:32 -04:00
Mike Butsko b8977cb432 Remove extra brace 2015-05-28 16:09:07 -04:00
Dmitriy Zaporozhets 51888f746c Merge branch 'nicer-acccount-page' into 'master' 
Make user settings account page nicer

* make 2 factor auth section `panel-default`
* make oauth buttons smaller
* remove primary button from reset token form

![Screenshot_2015-05-28_20.37.30](https://gitlab.com/gitlab-org/gitlab-ce/uploads/e536723e087b72a5c08b29072fb4972f/Screenshot_2015-05-28_20.37.30.png)

See merge request !733
 2015-05-28 19:52:26 +00:00
Dmitriy Zaporozhets 08a12f24b0 Make user settings account page nicer 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-05-28 20:36:47 +02:00
Dmitriy Zaporozhets d0d596ae4a Merge branch 'project-aside' into 'master' 
Use panels instead of well for widgets in project sidebar

Cleaner look and less distractive

![Screenshot_2015-05-28_17.31.27](https://gitlab.com/gitlab-org/gitlab-ce/uploads/d4f8e58f76c7f62c488dd571c313e21e/Screenshot_2015-05-28_17.31.27.png)

See merge request !732
 2015-05-28 16:11:55 +00:00
Dmitriy Zaporozhets a01737ac78 Use panels instead of well for widgets in project sidebar 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-05-28 17:30:05 +02:00
Dmitriy Zaporozhets ce5928f4df Merge branch 'profile-settings' 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	app/views/profiles/accounts/show.html.haml
 2015-05-28 16:31:38 +02:00
Dmitriy Zaporozhets ad3462332b Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-05-28 16:10:28 +02:00
Dmitriy Zaporozhets 0c7da9d534 Merge branch 'master' of github.com:gitlabhq/gitlabhq 2015-05-28 16:09:58 +02:00
Dmitriy Zaporozhets 9e50f28ee9 Fix profile tests after header rename 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-05-28 15:32:28 +02:00
Dmitriy Zaporozhets 35d0d774a1 Prefer panels over fieldset when different forms 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-05-28 15:26:37 +02:00
Dmitriy Zaporozhets 05a44dcb8b Merge branch 'user-destroy-wo-groups' into 'master' 
You can not remove user if he/she is an only owner of group

To prevent loose of group data you need to transfer or remove group
first before you can remove user

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

See merge request !730
 2015-05-28 13:14:58 +00:00
Dmitriy Zaporozhets 47989d6037 Consistent header look for setting pages 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-05-28 14:54:05 +02:00
Dmitriy Zaporozhets dcc9dc94d5 Re-organize profile settings titles and headers 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-05-28 14:44:38 +02:00
Dmitriy Zaporozhets 2db026793d Fix current user removal 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-05-28 12:53:04 +02:00
Dmitriy Zaporozhets 9cc23910a6 Add CHANGELOG item 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-05-28 12:03:53 +02:00
Dmitriy Zaporozhets 499154518a You can not remove user if he/she is an only owner of group 
To prevent loose of group data you need to transfer or remove group
first before you can remove user

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-05-28 12:00:02 +02:00
Douwe Maan 06250eef2e Merge branch 'fix-git-blame-syntax-highlighting' into 'master' 
Fix git blame syntax highlighting when different commits break up lines

### What does this MR do?

This MR fixes a bug where syntax highlighting would not work properly in certain lines when doing a `git blame` view of a file. Also, this MR reuses the Rugments lexer and formatter for each `git blame` commit block, which should make things faster and reduce overhead.

### Why was this MR needed?

When doing a `git blame`, GitLab feeds the Rugments lexer/formatter blocks of code based on the latest commit for each line.  However, this can cause lexer to fail because the state is cleared between each block of code, which causes `highlight` to fallback to the plaintext lexer. For example, notice this unhighlighted line in [this file](https://gitlab.common-lisp.net/cmucl/cmucl/blame/master/src/assembly/assemfile.lisp):

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

The fixed version looks like this:

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

This MR requires a patch to rugments to allow the `continue` option to be passed to the lexer.

* https://github.com/rumpelsepp/rugments/pull/24
* https://github.com/rumpelsepp/rugments/pull/23
* Also submitted to rouge: https://github.com/jneen/rouge/pull/267

### What are the relevant issue numbers?

Closes #1521

See merge request !697
 2015-05-28 09:40:00 +00:00
Marin Jankovski 549881152a Merge branch 'chlg-update' into 'master' 
update changelog for 7.11.4

See merge request !1833
 2015-05-28 09:06:38 +00:00
Job van der Voort 29b75e1480 update changelog for 7.11.4 2015-05-28 10:59:26 +02:00
Jeroen van Baarsen 91f2d3c229 Merge pull request #9335 from stefan-it/documentation/timezone-clarifications 
[Documentation] non-omnibus instructions for changing time zone
 2015-05-28 10:46:18 +02:00
Jeroen van Baarsen 3865a1d925 Allow special characters in users bio 
**What does this do?**
It removes the very strict sanitation on the users bio field, so that people can
have a bio like "I <3 GitLab"

**Why is this needed?**
Currently when you enter a bio with "I <3 GitLab", we only store "I ". This is
unexpected behaviour, since we want users to have a normal profile, without
having to worry what characters are allowed and which are not.

**Related issues:**
Fixes https://github.com/gitlabhq/gitlabhq/issues/5625

Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
 2015-05-28 10:45:22 +02:00
Jeroen van Baarsen 5322099464 Merge pull request #9184 from rumpelsepp/english 
Some language improvements
 2015-05-28 10:43:41 +02:00
Dmitriy Zaporozhets 72e410965d Merge branch 'rs-persist-tab-selection' into 'master' 
Persist current merge request tab selection via URL

Closes internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2350

See merge request !728
 2015-05-28 07:49:15 +00:00