Commit Graph
11707 Commits
Author SHA1 Message Date
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
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 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
Douwe Maan 9ae820ad2e Merge branch 'rs-issue-12677' into 'master'
Update text_color_for_bg helper to support RGB triplet color codes

Closes #12677

See merge request !2587
2016-01-26 12:02:42 +00:00
Douwe Maan 28e2d2142c Merge branch 'rs-groups-index' into 'master'
Make the `/groups` route behave as expected

The route is supposed to redirect the Groups#index request based on
whether or not a user was logged in. If they are, we redirect them to
their groups dashboard; if they're not, we redirect them to the public
Explore page.

But due to overly aggressive `before_action`s that weren't excluding (or including) the
`index` action, the request always resulted in a 404, whether a user was
logged in or not.

Closes #12660

See merge request !2580
2016-01-26 11:59:05 +00:00
James Lopez 89aeed183c feature and fix for 500 on group missing 2016-01-26 12:16:47 +01:00
Yorick Peterse 128a6411d2 Don't pluck project IDs for events
By instead using a sub-query we save ourselves the overhead of loading
any data into memory only to pass it on to another query.
2016-01-26 10:51:53 +01:00
Zeger-Jan van de Weg 89154880e5 Save button on app settings now btn-save 2016-01-26 10:05:28 +01:00
Grzegorz Bizon 8d397862cd Use generic method to checks if artifacts are available 2016-01-26 08:34:48 +01:00
Jacob Schatz 5e88d7357f Placeholder now visible completely.
Fixes #2498
2016-01-25 23:54:24 -05:00
Jacob Schatz 28aa715811 Clicks the edit button instead of opening the dropdown
Fixes #2307
2016-01-25 22:38:15 -05:00
Robert Speicher 05697adb42 Limit jquery-ui requires to what we actually use
This commit is a smoke test to run CI and see if we get back any JS
errors.
2016-01-25 18:42:45 -08:00
Douglas Barbosa Alexandre 6dd88e090e Extract Projects::ImportService service from RepositoryImportWorker 2016-01-25 22:58:30 -02:00
Robert Speicher fd33b2cdc0 Merge branch 'fix-import-redirect-loop' into 'master'
Fix import redirect loop

Fixes #11864 

See merge request !2606
2016-01-26 00:48:56 +00:00
Robert Speicher 68ad3180b3 Merge branch 'note-highlighting' into 'master'
Highlight note code and edit preview

More highlighting fixes! Highlighting wasn't applied all the way for
code in notes, diff notes diffs and diff preview (on the file edit page).

The CSS changes further unify the styling for file-content highlighting,
diff highlighting and note code highlighting.

See merge request !2594
2016-01-25 23:43:44 +00:00
Douglas Barbosa Alexandre 46c36e0e01 Fixi import redirect loop 2016-01-25 21:00:23 -02:00
Robert Speicher 991cd07619 Merge branch 'prioritize-previewable-over-plain-readmes' into 'master'
Prioritize previewable over plain README files

Fixes #12441

See merge request !2521
2016-01-25 21:42:53 +00:00
Jose Torres 26e31f5820 Substituted deprecated forum link with project issues link. [ci skip] 2016-01-25 13:10:11 -06:00
Jacob Schatz 8b3285bfdf Merge branch 'top-search-colors-and-element-position-is-not-like-in-design' into 'master'
Adds base64 background search icon.

All inputs of type `search` will have the gray background
and search icon centered.
Because the search magnifier is a bg image,
I had to hide it with `[value=""]`.
I added a little javascript to make sure each input always has it's
own `value`.

A text and icon placeholder in the center of the input that disappears when typed is only possible with javascript. If you just want the icon or just the text it can be done with css alone.
If you want the icon/text justified left, then the search magnifier does not have to disappear. 

Fixes #11870 

cc @skyruler @creamzy 

![searchinput](/uploads/136ab91d4ff9ce717979d0ce1a23ab03/searchinput.gif)


See merge request !2546
2016-01-25 18:13:47 +00:00
Douglas Barbosa Alexandre 1aa82dc459 Prioritize previewable over plain README files 2016-01-25 11:27:07 -02:00
James Lopez ee209cc936 fix rubocop new 2.2 syntax issues 2016-01-25 11:44:25 +01:00
Douwe Maan 40d2daed89 Highlight note code and edit preview 2016-01-25 11:42:47 +01:00
Douwe Maan 0f2a906211 Merge branch 'update-gitlab-git' into 'master'
Update gitlab_git & use new method for counting branches

Corresponding gitlab_git merge request detailing some of the rationale behind this: https://gitlab.com/gitlab-org/gitlab_git/merge_requests/62

Fixes #12418 

See merge request !2535
2016-01-25 09:35:54 +00:00