home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-22 11:06:10 +10:00
Code Issues Packages Projects Releases Wiki Activity
23,387 Commits 48 Branches 340 Tags
74e1add2fcbd47ec748e04c65d3eb947dba73cf2
Commit Graph
11754 Commits
Author SHA1 Message Date
Marin Jankovski 9d0065f054 Merge branch 'hotfix/ruby-21-broken-update' into 'master' 
fix syntax error on 2.1 and rubocop on 2.2

Background:

Hashes `{:'key': 'value'}` are not valid in 2.1 but are recommended by Rubocop on 2.2. We only use those when we have a key such as `weird-key`, `weird.key`, etc... 

We could disable Rubocop but it wouldn't warn us about the recommended syntax since `Ruby 1.9`: `{key: 'value'}`, which is valid for `Ruby 1.9+`.

Workaround 1 could be disabling `Style/HashSyntax:` in `rubocop.yml`. 

Workaround 2 (tried in this MR) is to trick Rubocop using `.to_sym` which is effectively the same as adding the `:`. This would allow to keep the warning in place.

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

See merge request !2637
 2016-01-29 08:12:18 +00:00
Robert Speicher 2b1ddb0f80 Merge branch 'mr-merge-base' into 'master' 
Correctly determine MR diff base when MR has merge conflicts

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

See merge request !2632
 2016-01-28 21:08:41 +00:00
Robert Speicher 0e79b5f396 Merge branch 'highlight-blame' into 'master' 
Fix highlighting in blame view.

See merge request !2630
 2016-01-28 20:30:21 +00:00
Robert Speicher 789e048352 Merge branch 'rs-ldap-user' into 'master' 
Backport LDAP user assignment changes from EE

See https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/146

See merge request !2641
 2016-01-28 19:09:52 +00:00
Robert Speicher 1e666ce695 Backport LDAP user assignment changes from EE 
See https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/146
 2016-01-28 13:31:48 -05:00
James Lopez 69c4e0a119 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into hotfix/ruby-21-broken-update 2016-01-28 18:14:28 +01:00
Dmitriy Zaporozhets 88e16c3d19 Merge branch 'issue_2406' into 'master' 
Show list of forks for a given Project

Closes #2406

See merge request !2376
 2016-01-28 16:58:38 +00:00
Dmitriy Zaporozhets 3f6bb7bc86 Merge branch 'issue_5546' into 'master' 
Save list sort in a cookie

Closes #5546 

See merge request !2537
 2016-01-28 16:21:04 +00:00
Douwe Maan b7ec476205 Merge branch 'master' into mr-merge-base 2016-01-28 15:12:24 +01:00
Jacob Schatz 695fb209b7 Merge branch 'sort-text-removed-from-sort-dropdown' into 'master' 
Removed sorted text from dropdowns

![Screen_Shot_2016-01-28_at_09.04.36](/uploads/9e0e1fdb45ad12d122f860a2164d9396/Screen_Shot_2016-01-28_at_09.04.36.png)

Closes #12796 

cc @creamzy @jschatz1 

See merge request !2635
 2016-01-28 14:11:05 +00:00
Douwe Maan 30b0d06e9f Fix specs 2016-01-28 15:10:48 +01:00
Douwe Maan 590e237d55 Merge branch 'master' into highlight-blame 2016-01-28 14:49:34 +01:00
Douwe Maan b636f83e59 Move blame group logic to dedicated class 2016-01-28 14:49:21 +01:00
Dmitriy Zaporozhets 9bf47f06ab Merge branch 'numbered-list-rendering-in-comments-cuts-off' into 'master' 
Makes ol margin big enough for 3 digits.

Fixes #7960 

![Screen_Shot_2016-01-25_at_11.20.03_PM](/uploads/73c4b9e939fe108fb3b8221e16e686bd/Screen_Shot_2016-01-25_at_11.20.03_PM.png)


See merge request !2608
 2016-01-28 13:07:26 +00:00
Dmitriy Zaporozhets 6748520de6 Merge branch 'feature/jschatz1/instant-issuable-history' into 'master' 
Adds feature: Ajax Close/Open updates discussion automatically

Triggers jQuery event <br/>
Fixes #5544

See merge request !2610
 2016-01-28 13:05:50 +00:00
James Lopez 902baa2e1c trick rubocop and temporarily add ruby 2.1 images for any branch 2016-01-28 11:41:58 +01:00
Phil Hughes 22e81f5dbe Removed sorted text from dropdowns 
Closes #12796
 2016-01-28 09:06:20 +00:00
Douwe Maan f025f80d5c Merge branch 'update-ruby-2.2.4' into 'master' 
Update Ruby version to 2.2.4 (latest previous stable) and update docs

Tests and issues added to https://github.com/gitlabhq/gitlabhq/issues/8696 were all fine after the upgrade. 

Main issue: https://gitlab.com/gitlab-org/gitlab-ce/issues/3340

See merge request !2534
 2016-01-27 21:39:08 +00:00
Robert Speicher bba7e786a6 Merge branch 'events-performance' into 'master' 
Improve performance of retrieving last update times for events

See 75195eefcca4cb3961986c90c8e837da02f30134 and
https://gitlab.com/gitlab-org/gitlab-ce/issues/12415#note_3387317
for the juicy details.

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

See merge request !2613
 2016-01-27 21:20:16 +00:00
Robert Speicher 614025da38 Merge branch 'rs-skip-2fa-on-signout' into 'master' 
Skip the 2FA requirement during logout

See merge request !2581
 2016-01-27 21:17:31 +00:00
Robert Speicher 27893b972d Merge branch 'diff-colors' into 'master' 
Increase contrast between highlighted code comments and inline diff marker.

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

It was especially bad in Monokai, better now.

See merge request !2629
 2016-01-27 20:59:27 +00:00
Rubén Dávila 0ee875f961 Align filter dropdown. 2016-01-27 15:21:27 -05:00
Robert Speicher 56538f9cc1 Merge branch 'fix/unexistent-group-500' into 'master' 
Return a 404 instead of a 500 when accessing a non-existent group

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

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

See merge request !2614
 2016-01-27 20:19:35 +00:00
Dmitriy Zaporozhets 4dea268215 Merge branch 'rs-require-jquery-ui' into 'master' 
Limit jquery-ui requires to what we actually use



See merge request !2274
 2016-01-27 19:14:20 +00:00
Dmitriy Zaporozhets 7e6da7b91a Merge branch 'rs-2fa-requirement-wording' into 'master' 
Update wording for 2FA requirement notice



See merge request !2582
 2016-01-27 19:04:44 +00:00
Dmitriy Zaporozhets 48b6b0a446 Merge branch 'rs-issue-12672' into 'master' 
Remove link from system hook

Closes #12672

See merge request !2588
 2016-01-27 18:45:51 +00:00
Douwe Maan 5cce1278ad Correctly determine MR diff base when MR has merge conflicts 2016-01-27 17:23:59 +01:00
Douwe Maan 4be80f8aa3 Fix highlighting in blame view. 2016-01-27 16:15:24 +01:00
Douwe Maan 606f8e9190 Increase contrast between highlighted code comments and inline diff marker. 2016-01-27 16:08:42 +01:00
James Lopez 683770f35d Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into update-ruby-2.2.4 2016-01-27 15:42:35 +01:00
James Lopez afde800b25 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/unexistent-group-500 2016-01-27 11:35:13 +01:00
James Lopez eef9c9d447 update fix based on feedback 2016-01-27 10:44:24 +01:00
Yorick Peterse de7c9c7ab1 Use Atom update times of the first event 
By simply loading the first event from the already sorted set we save
ourselves extra (slow) queries just to get the latest update timestamp.
This removes the need for Event.latest_update_time and significantly
reduces the time needed to build an Atom feed.

Fixes gitlab-org/gitlab-ce#12415
 2016-01-27 10:33:33 +01:00
Kamil Trzciński 5e0ee54c6c Merge branch 'fix/commit-status-artifacts' into 'master' 
Use generic method to checks if artifacts are available

Closes #12626

See merge request !2576
 2016-01-27 09:07:47 +00:00
Blake Hitchcock 4be65c3231 Update ExternalIssue regex for JIRA integration 
The pattern in the `::reference_pattern` class method in the
ExternalIssue model does not match all valid forms of JIRA project
names. I have updated the regex to match JIRA project names with numbers
and underscores. More information on valid JIRA project names can be
found here:
https://confluence.atlassian.com/jira/changing-the-project-key-format-192534.html

* The first character must be a letter,
* All letters used in the project key must be from the Modern Roman Alphabet and upper case, and
* Only letters, numbers or the underscore character can be used.
 2016-01-26 15:55:40 -05:00
Dmitriy Zaporozhets 95c644dfa2 Merge branch 'bug/jschatz1/file-browser-lines' into 'master' 
Bug/jschatz1/file browser lines

Fixes #12725 

![Screen_Shot_2016-01-26_at_11.19.39_AM](/uploads/c5f5a143926600e02de4cfc0687ed8dd/Screen_Shot_2016-01-26_at_11.19.39_AM.png)


See merge request !2615
 2016-01-26 20:23:43 +00:00
Jacob Schatz a98bf00ca6 Adds margin top to readme holder so not flush. 2016-01-26 14:51:55 -05:00
Jacob Schatz 2cc20853c9 adds border color to tables globally. 2016-01-26 14:40:52 -05:00
Dmitriy Zaporozhets 6d50b3ebf2 Merge branch 'search-box-in-group-members-view-is-too-small-for-placeholder-in-chrome' into 'master' 
Fixes: Search box in Group Members view is too small for placeholder in Chrome

Fixes #2498 

![Screen_Shot_2016-01-25_at_11.55.57_PM](/uploads/de4fda98cd8552641208b3a7a9277e35/Screen_Shot_2016-01-25_at_11.55.57_PM.png)


See merge request !2609
 2016-01-26 18:35:05 +00:00
Jacob Schatz dd60590a3c Fix border color. 
Uses `$border-color`
 2016-01-26 11:54:31 -05:00
Dmitriy Zaporozhets bf543c99f8 Merge branch 'using-a-or-m-hotkeys-on-issuable-tab' into 'master' 
Clicks the edit button instead of opening the dropdown

Fixes #2307 

Instead of opening the menu, this clicks the `edit` button.

See merge request !2607
 2016-01-26 16:54:24 +00:00
Jacob Schatz 2b98b7faa1 Revert "Styles for file list change." 
This reverts commit a14089485f.
 2016-01-26 11:52:30 -05:00
Jacob Schatz 9a1ec97fc4 Revert "Adjusts styles of table tree" 
This reverts commit 111834883d.
 2016-01-26 11:52:09 -05:00
Jacob Schatz 111834883d Adjusts styles of table tree 
Fixes #12725
 2016-01-26 11:21:09 -05:00
James Lopez d6a186135f fix for failing spec 2016-01-26 15:43:09 +01:00
Zeger-Jan van de Weg c10296f92d Fix visibility level texts on application settings 
Introduced by me through !2005
 2016-01-26 14:54:35 +01:00
Jacob Schatz a14089485f Styles for file list change. 
New download btn WIP.
 2016-01-26 08:45:18 -05:00
Douwe Maan b227b9add0 Merge branch 'save-button-color-application-settings' into 'master' 
Save button on app settings now btn-save

Some save buttons where `btn-primary` where throughout the application these usually are `btn-save`.

Before (Application settings)

![Screenshot_from_2016-01-26_09-44-32](/uploads/f4019349c8bac6e0c91e23252a70d334/Screenshot_from_2016-01-26_09-44-32.png)

After

![Screenshot_from_2016-01-26_09-45-20](/uploads/8e59a2b180832f44e3908b22187549af/Screenshot_from_2016-01-26_09-45-20.png)


See merge request !2612
 2016-01-26 13:43:50 +00:00
Douwe Maan b6eb416389 Merge branch 'track-project-import-failure' into 'master' 
Track project import failure

Fixes #12512 

This also help us on identify why the import process is returning the wrong status when the project was successfully imported. Like mentioned in the issue #12450 

See merge request !2538
 2016-01-26 13:33:47 +00:00
Douglas Barbosa Alexandre c040323419 Move Gitlab::BitbucketImport::KeyDeleter to it's own importer 2016-01-26 10:56:22 -02:00