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
18,287 Commits 48 Branches 340 Tags
0a5b005da170fe81afea012b56f4810125b13ead
Commit Graph
4837 Commits
Author SHA1 Message Date
Dmitriy Zaporozhets dfccb06dda Refactor web editor 
* fix problem with editing non-master branch
* before commit make sure branch exists
* dont allow user change file in one branch and commit to another existing branch
* remove a lot of code duplication
* remove outdated statellite errors

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-05 15:01:38 +02:00
Douwe Maan 44458f3ca2 Add "Remember me" checkbox to LDAP signin form. 2015-06-05 14:37:01 +02:00
Douwe Maan 9a50db693a Fix timeout when rendering file with thousands of lines. 2015-06-05 13:56:37 +02:00
Douwe Maan bdfd163aa1 Add info about WIP merge requests to docs. 2015-06-05 13:12:55 +02:00
Douwe Maan 5256b5cc06 Prefer jQuery on to bind, and don't use .js class. 2015-06-05 12:13:02 +02:00
Dmitriy Zaporozhets 8d2996fe0e Fix empty header 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-05 12:08:43 +02:00
Douwe Maan 4ae67fcaef Show warning when a comment will add 10 or more people to the discussion. 2015-06-05 12:07:13 +02:00
Dmitriy Zaporozhets 1d945945bb Merge branch 'sn-push-email-plussign' into 'master' 
Use entity number for plus sign in push emails

Was doing some testing today and found that both outlook and gmail had issues displaying the html content produced for push emails when a file was added.

This is how gmail shows it:
![Gmail_name](https://gitlab.com/stevenorman/gitlab-ce/uploads/24be115dbae97997bc02e2ec70d9870c/Gmail_name.png)

And this is for Outlook:
![Outlook_name](https://gitlab.com/stevenorman/gitlab-ce/uploads/4b5a54956139d36d78f9c61c83e99928/Outlook_name.png)

iOS devices work with the &plus; entity, as does Mail on OS X, but I'm wondering if it is only available for newer html parsers (a quick browse on the w3c site seems to show that it was added in html 5).

Changing the entity to `&#43;` and both gmail and outlook and iOS and Mail.

See merge request !721
 2015-06-04 15:57:53 +00:00
Dmitriy Zaporozhets ef3e0931b9 Merge branch 'fix-no-labels-page' into 'master' 
Omit link to generate labels if user does not have access to create them

On a project that has no labels, a user was provided a link to create labels on the "Labels" tab, resulting in a 404. This MR changes the next to "No labels created" if the user lands on this page but does not have permission to add a label.

Screenshot:

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

Closes https://github.com/gitlabhq/gitlabhq/issues/8353

See merge request !752
 2015-06-04 15:56:13 +00:00
Robert Speicher 793d9799b6 Show key fingerprint on DeployKeys#index 
Also style all key fingerprints consistently across the app.
 2015-06-03 18:03:04 -04:00
Robert Speicher 6e5473f930 Remove show actions from Admin and Project DeployKeys 2015-06-03 18:03:04 -04:00
Douwe Maan 69630394cf Merge branch 'add-resend-confirmation-email-in-profile' into 'master' 
Add "Resend confirmation e-mail" link in profile settings

Adds a convenience link to resend the confirmation e-mail if necessary. Before, user had to logout or open an Incognito Window to do this.

Screenshot:

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

Fixes https://github.com/gitlabhq/gitlabhq/issues/9274

See merge request !634
 2015-06-03 11:47:45 +00:00
Dmitriy Zaporozhets 41d4aaa4be Merge branch 'rs-more-js-testing' into 'master' 
More Javascript testing

Continuation of !715

See merge request !736
 2015-06-03 08:13:50 +00:00
Dmitriy Zaporozhets 8631b6a258 Merge branch 'rs-issue-1022' into 'master' 
Push event: Nest link in strong tag, not vice-versa

Closes #1022

See merge request !755
 2015-06-03 08:12:43 +00:00
Stan Hu a38dd9bd3a Add "Resend confirmation e-mail" link in profile settings 
Fixes https://github.com/gitlabhq/gitlabhq/issues/9274
 2015-06-03 00:12:43 -07:00
Robert Speicher 4560954404 Move jQuery enable/disable extensions to extensions/jquery 
Removes redundant enableButton/disableButton extensions, and adds specs
for the jQuery extensions.
 2015-06-02 20:32:07 -04:00
Robert Speicher e860dedd1c Push event: Nest link in strong tag, not vice-versa 
Closes #1022
 2015-06-02 15:05:44 -04:00
Robert Speicher 023dd2907b Add a pipeline context option for SanitizationFilter 
When this option is `:description`, we use a more restrictive whitelist.
This is used for Project and Group description fields.
 2015-06-02 13:04:10 -04:00
Robert Speicher 2a5c963b7c Render Group and Project descriptions with our Markdown pipeline 2015-06-02 13:04:10 -04:00
Stan Hu cf7707b4fe Omit link to generate labels if user does not have access to create them 
Closes https://github.com/gitlabhq/gitlabhq/issues/8353
 2015-06-01 22:42:53 -07:00
Dmitriy Zaporozhets d9d9c7d7bc Allow base64 for edit blobs 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-01 23:43:08 +02:00
Dmitriy Zaporozhets 01f6ae2351 improve navbar collapse for mobile views 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-01 17:55:20 +02:00
Dmitriy Zaporozhets e7e07fab5d Refactor header views 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-01 17:09:30 +02:00
Dmitriy Zaporozhets 46e3d13eac More fixes to header css 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-01 16:36:26 +02:00
Dmitriy Zaporozhets d4dde374aa Refactor header css/html 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-01 15:45:36 +02:00
Dmitriy Zaporozhets 38bac5d7ae Show avatars in merge widget and fix mr download button overflow 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-06-01 12:17:55 +02:00
Dmitriy Zaporozhets b862998b8e Merge branch 'feature/sign_out_page' into 'master' 
Allow to configure a URL to show after sign out

Split of !669 as requested

This is especially useful with SAML ( !722 ) since the omniauth-saml gem does not support single log-out. This provides a way to log out the user from the SAML IdP after signing out from GitLab.

See merge request !725
 2015-06-01 09:58:52 +00:00
Alex Lossent 60225a067d Allow to configure a URL to show after sign out 2015-05-29 18:20:15 +02:00
Dmitriy Zaporozhets 467d7f6720 Improve UI of project sidebar 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-05-29 18:12:31 +02:00
Dmitriy Zaporozhets a3b60982e5 Merge branch 'leave-project' into 'master' 
Add ability to leave project

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

See merge request !744
 2015-05-29 15:10:46 +00:00
Dmitriy Zaporozhets a1c45338f3 Merge branch 'support-edit-target-branch-in-mr' into 'master' 
Support editing target branch of merge request

### What does this MR do?

This MR makes it possible to edit the target branch of a merge request and adds a system note when this happens.

### Why was this MR needed?

Because lots of people requested this feature. :)

### Screenshots

**Edit MR page**

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

**New MR page**

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

**System note**

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

### What are the relevant issue numbers?

* Closes https://github.com/gitlabhq/gitlabhq/issues/7105
* See: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/130!

See merge request !738
 2015-05-29 15:01:54 +00:00
Dmitriy Zaporozhets ab2e67550b Merge branch 'user-oauth-applications' into 'master' 
Add option to disallow users from registering any application to use GitLab as an OAuth provider

Addresses internal issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2264.

![Screen_Shot_2015-05-29_at_13.30.11](https://gitlab.com/gitlab-org/gitlab-ce/uploads/300f8e9ecbeb3d353ebc33a63cdef4e9/Screen_Shot_2015-05-29_at_13.30.11.png)

See merge request !742
 2015-05-29 14:51:33 +00:00
Dmitriy Zaporozhets 7815f9ddac Make leave buttons more explicit 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-05-29 16:34:26 +02:00
Dmitriy Zaporozhets 2afa5fcb52 Add ability to leave project 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
 2015-05-29 16:23:36 +02:00
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 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
Douwe Maan 96d6fdc27c Add option to disallow users from registering any application to use GitLab as an OAuth provider 2015-05-29 13:29:16 +02:00
Stan Hu 5e4384ec9b Support editing target branch of merge request 
Closes https://github.com/gitlabhq/gitlabhq/issues/7105
See: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/130
 2015-05-29 04:08:08 -07:00
Douwe Maan d5b1c58e26 Shorten merge request WIP text. 2015-05-29 11:37:12 +02: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 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
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
Mike Butsko b8977cb432 Remove extra brace 2015-05-28 16:09:07 -04: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 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 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