summaryrefslogtreecommitdiff
path: root/app/views
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into lazy-blobslazy-blobsJacob Vosmaer2016-02-021-1/+4
|\
| * Render sanitized SVG imagesStan Hu2016-02-011-1/+4
| | | | | | | | Closes https://github.com/gitlabhq/gitlabhq/issues/9265
* | Move load command into _text partialJacob Vosmaer2016-02-022-1/+1
| |
* | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into lazy-blobsJacob Vosmaer2016-02-0178-234/+339
|\ \ | |/
| * Make "Two-factor" casing consistent throughout the applicationrs-two-factor-casingRobert Speicher2016-01-312-4/+4
| |
| * Merge branch 'rename-inline-diff' into 'master' Robert Speicher2016-01-312-10/+14
| |\ | | | | | | | | | | | | Mark inline difference between old and new paths when a file is renamed See merge request !2652
| | * Mark inline difference between old and new paths when a file is renamedDouwe Maan2016-01-292-10/+14
| | |
| * | Merge branch 'warn-admin-oauth' into 'master' Douwe Maan2016-01-301-1/+10
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Warn admin of granting admin rights during OAuth Fixes #3951 Warning style the same as the warning a user sees on a archived project. ![Screenshot_from_2016-01-25_20-06-33](/uploads/42e6a218b963311fd20c0b7c87c8cf4f/Screenshot_from_2016-01-25_20-06-33.png) See merge request !2601
| | * | Improve text on warning messageZeger-Jan van de Weg2016-01-261-1/+3
| | | |
| | * | Warn admin of granting admin rights during OAuthZeger-Jan van de Weg2016-01-261-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | Fixes #3951 Warning style the same as the warning a user sees on a archived project.
| * | | Merge branch 'focus-emoji-search-field' into 'master' Jacob Schatz2016-01-291-1/+1
| |\ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-focus emoji award search field ![emoji-search-focus](/uploads/7cd0448e00ced19d3cf1c4fdd141c74f/emoji-search-focus.gif) Closes #12621 cc. @jschatz1 See merge request !2650
| | * | Auto-focus emoji award search fieldPhil Hughes2016-01-291-1/+1
| | | | | | | | | | | | | | | | Closes #12621
| * | | Partially revert "Add IP check against DNSBLs at account sign-up"rs-remove-ip-blockingRobert Speicher2016-01-281-16/+0
| |/ / | | | | | | | | | | | | This partially reverts 6a5cd3ca - we keep the migration and add a new migration that reverts it in order to keep migration history intact.
| * | Merge branch 'highlight-blame' into 'master' Robert Speicher2016-01-281-6/+4
| |\ \ | | | | | | | | | | | | | | | | Fix highlighting in blame view. See merge request !2630
| | * \ Merge branch 'master' into highlight-blameDouwe Maan2016-01-285-6/+5
| | |\ \
| | * | | Move blame group logic to dedicated classDouwe Maan2016-01-281-2/+2
| | | | |
| | * | | Fix highlighting in blame view.Douwe Maan2016-01-271-4/+2
| | | | |
| * | | | Merge branch 'issue_2406' into 'master' Dmitriy Zaporozhets2016-01-287-10/+92
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Show list of forks for a given Project Closes #2406 See merge request !2376
| | * | | | Refactor some CSS rules.Rubén Dávila2016-01-201-1/+1
| | | | | |
| | * | | | Some fixes from last code review.Rubén Dávila2016-01-203-4/+4
| | | | | |
| | * | | | Some CSS and sorting fixes.Rubén Dávila2016-01-201-1/+1
| | | | | |
| | * | | | Add icon for private forks notice. #2406Rubén Dávila2016-01-201-1/+2
| | | | | |
| | * | | | Add ability to sort forks. #2406Rubén Dávila2016-01-201-4/+5
| | | | | |
| | * | | | aligns menu at top on one rowJacob Schatz2016-01-201-10/+10
| | | | | |
| | * | | | WIP: Add sort dropdown. #2406Rubén Dávila2016-01-201-0/+20
| | | | | |
| | * | | | Little update to copy and custom content for empty results. #2406Rubén Dávila2016-01-201-8/+13
| | | | | |
| | * | | | Show last commit as description. #2406Rubén Dávila2016-01-203-4/+10
| | | | | |
| | * | | | Add ability to filter by namespace. #2406Rubén Dávila2016-01-201-11/+17
| | | | | |
| | * | | | Use adequate icon for Forks link on sidebar. #2406Rubén Dávila2016-01-201-1/+1
| | | | | |
| | * | | | Show forks counter on listing. #2406Rubén Dávila2016-01-203-2/+10
| | | | | |
| | * | | | Add fork button and implement ability to distinguish between public and ↵Rubén Dávila2016-01-201-1/+22
| | | | | | | | | | | | | | | | | | | | | | | | protected forks. #2406
| | * | | | Use Project creator's avatar in fork listing. #2406Rubén Dávila2016-01-204-3/+10
| | | | | |
| | * | | | Setup new fork link in sidebar and routes. #2406Rubén Dávila2016-01-205-6/+13
| | | | | |
| * | | | | Removed sorted text from dropdownsPhil Hughes2016-01-287-8/+7
| | |_|/ / | |/| | | | | | | | | | | | | Closes #12796
| * | | | Merge branch 'events-performance' into 'master' Robert Speicher2016-01-274-4/+4
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-274-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | 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
| | | |/ / | | |/| |
| * | | | Fix visibility level texts on application settingsZeger-Jan van de Weg2016-01-261-2/+2
| | | | | | | | | | | | | | | | | | | | Introduced by me through !2005
| * | | | Save button on app settings now btn-saveZeger-Jan van de Weg2016-01-263-4/+3
| |/ / /
| * | | Merge branch 'note-highlighting' into 'master' Robert Speicher2016-01-254-8/+7
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-254-8/+7
| | |/ /
| * | | Substituted deprecated forum link with project issues link. [ci skip]Jose Torres2016-01-251-3/+3
| | | |
| * | | Distinguishes between search inputs.Jacob Schatz2016-01-241-1/+1
| | | | | | | | | | | | | | | | Main search input has different styles than secondary search inputs.
| * | | Adds base64 background search icon.Jacob Schatz2016-01-241-1/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | Merge branch 'issuable-white-bg' into 'master' Jacob Schatz2016-01-235-13/+12
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove gray background from issue/mr/milestone background Fixes #6062 Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> cc @skyruler @creamzy See merge request !2573
| | * | Remove gray background from issue/mr/milestone backgroundissuable-white-bgDmitriy Zaporozhets2016-01-225-13/+12
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Fix UI for pages with panelsfix-ui-paddingDmitriy Zaporozhets2016-01-229-13/+9
| |/ / | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>