summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'events-performance' into 'master' Robert Speicher2016-01-278-20/+14
|\ | | | | | | | | | | | | | | | | | | | | 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
| * Use Atom update times of the first eventevents-performanceYorick Peterse2016-01-276-13/+5
| | | | | | | | | | | | | | | | | | 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
| * Don't pluck project IDs for eventsYorick Peterse2016-01-265-10/+12
| | | | | | | | | | 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.
* | Merge branch 'rs-skip-2fa-on-signout' into 'master' Robert Speicher2016-01-271-0/+2
|\ \ | | | | | | | | | | | | Skip the 2FA requirement during logout See merge request !2581
| * | Skip the 2FA requirement during logoutrs-skip-2fa-on-signoutRobert Speicher2016-01-231-0/+2
| | |
* | | Merge branch 'diff-colors' into 'master' Robert Speicher2016-01-274-8/+8
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | Increase contrast between highlighted code comments and inline diff marker.diff-colorsDouwe Maan2016-01-274-8/+8
| | | |
* | | | Merge branch 'fix/unexistent-group-500' into 'master' Robert Speicher2016-01-271-0/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * \ \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵James Lopez2016-01-2714-57/+105
| |\ \ \ \ | | |/ / / | | | | | | | | | | fix/unexistent-group-500
| * | | | update fix based on feedbackJames Lopez2016-01-271-2/+1
| | | | |
| * | | | fix for failing specJames Lopez2016-01-261-1/+2
| | | | |
| * | | | feature and fix for 500 on group missingJames Lopez2016-01-261-0/+1
| | |_|/ | |/| |
* | | | Merge branch 'rs-require-jquery-ui' into 'master' Dmitriy Zaporozhets2016-01-271-1/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Limit jquery-ui requires to what we actually use See merge request !2274
| * | | | Limit jquery-ui requires to what we actually users-require-jquery-uiRobert Speicher2016-01-251-1/+4
| |/ / / | | | | | | | | | | | | | | | | This commit is a smoke test to run CI and see if we get back any JS errors.
* | | | Merge branch 'rs-2fa-requirement-wording' into 'master' Dmitriy Zaporozhets2016-01-271-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update wording for 2FA requirement notice See merge request !2582
| * | | | Update wording for 2FA requirement noticers-2fa-requirement-wordingRobert Speicher2016-01-231-2/+2
| | |_|/ | |/| |
* | | | Merge branch 'rs-issue-12672' into 'master' Dmitriy Zaporozhets2016-01-271-2/+1
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | Remove link from system hook Closes #12672 See merge request !2588
| * | | Remove link from system hookrs-issue-12672Robert Speicher2016-01-241-2/+1
| | | | | | | | | | | | | | | | Closes #12672
* | | | Merge branch 'fix/commit-status-artifacts' into 'master' Kamil Trzciński2016-01-271-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use generic method to checks if artifacts are available Closes #12626 See merge request !2576
| * | | | Use generic method to checks if artifacts are availableGrzegorz Bizon2016-01-261-1/+1
| | |_|/ | |/| |
* | | | Update ExternalIssue regex for JIRA integrationBlake Hitchcock2016-01-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | Merge branch 'bug/jschatz1/file-browser-lines' into 'master' Dmitriy Zaporozhets2016-01-263-3/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | Adds margin top to readme holder so not flush.Jacob Schatz2016-01-261-0/+1
| | | | |
| * | | | adds border color to tables globally.Jacob Schatz2016-01-262-4/+1
| | | | |
| * | | | Fix border color.bug/jschatz1/file-browser-linesJacob Schatz2016-01-261-0/+1
| | | | | | | | | | | | | | | | | | | | Uses `$border-color`
| * | | | Revert "Styles for file list change."Jacob Schatz2016-01-264-36/+37
| | | | | | | | | | | | | | | | | | | | This reverts commit a14089485ff697d58dddb61e6da2d1b6c64a803e.
| * | | | Revert "Adjusts styles of table tree"Jacob Schatz2016-01-262-34/+10
| | | | | | | | | | | | | | | | | | | | This reverts commit 111834883d287c89a24ae395900786d771214bdb.
| * | | | Adjusts styles of table treeJacob Schatz2016-01-262-10/+34
| | | | | | | | | | | | | | | | | | | | Fixes #12725
| * | | | Styles for file list change.Jacob Schatz2016-01-264-37/+36
| | | | | | | | | | | | | | | | | | | | New download btn WIP.
* | | | | Merge branch ↵Dmitriy Zaporozhets2016-01-261-0/+10
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '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
| * | | | | Placeholder now visible completely.search-box-in-group-members-view-is-too-small-for-placeholder-in-chromeJacob Schatz2016-01-251-0/+10
| | |/ / / | |/| | | | | | | | | | | | | Fixes #2498
* | | | | Merge branch 'using-a-or-m-hotkeys-on-issuable-tab' into 'master' Dmitriy Zaporozhets2016-01-261-2/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | Clicks the edit button instead of opening the dropdownusing-a-or-m-hotkeys-on-issuable-tabJacob Schatz2016-01-251-2/+2
| |/ / / / | | | | | | | | | | | | | | | Fixes #2307
* | | | | Fix visibility level texts on application settingsZeger-Jan van de Weg2016-01-261-2/+2
| | | | | | | | | | | | | | | | | | | | Introduced by me through !2005
* | | | | Merge branch 'save-button-color-application-settings' into 'master' Douwe Maan2016-01-263-4/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | Save button on app settings now btn-saveZeger-Jan van de Weg2016-01-263-4/+3
| |/ / / /
* | | | | Merge branch 'track-project-import-failure' into 'master' Douwe Maan2016-01-262-39/+74
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | Move Gitlab::BitbucketImport::KeyDeleter to it's own importerDouglas Barbosa Alexandre2016-01-261-4/+0
| | | | |
| * | | | Extract Projects::ImportService service from RepositoryImportWorkerDouglas Barbosa Alexandre2016-01-252-39/+78
| | | | |
* | | | | Merge branch 'rs-issue-12677' into 'master' Douwe Maan2016-01-261-1/+5
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update text_color_for_bg helper to support RGB triplet color codes Closes #12677 See merge request !2587
| * | | | | Update text_color_for_bg helper to support RGB triplet color codesrs-issue-12677Robert Speicher2016-01-241-1/+5
| | |_|/ / | |/| | | | | | | | | | | | | Closes #12677
* | | | | Merge branch 'rs-groups-index' into 'master' Douwe Maan2016-01-261-4/+5
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | Make the `/groups` route behave as expectedrs-groups-indexRobert Speicher2016-01-231-4/+5
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 the `index` action, the request always resulted in a 404, whether a user was logged in or not. Closes #12660
* | | | Merge branch 'fix-import-redirect-loop' into 'master' Robert Speicher2016-01-261-5/+15
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | Fix import redirect loop Fixes #11864 See merge request !2606
| * | | Fixi import redirect loopDouglas Barbosa Alexandre2016-01-251-5/+15
| | | |
* | | | Merge branch 'note-highlighting' into 'master' Robert Speicher2016-01-2516-64/+34
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | Highlight note code and edit previewnote-highlightingDouwe Maan2016-01-2516-64/+34
| | | | |
* | | | | Merge branch 'prioritize-previewable-over-plain-readmes' into 'master' Robert Speicher2016-01-251-4/+12
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prioritize previewable over plain README files Fixes #12441 See merge request !2521
| * | | | | Prioritize previewable over plain README filesprioritize-previewable-over-plain-readmesDouglas Barbosa Alexandre2016-01-251-4/+12
| |/ / / /
* | | | | Substituted deprecated forum link with project issues link. [ci skip]Jose Torres2016-01-251-3/+3
| |/ / / |/| | |