Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/master' into lazy-blobslazy-blobs | Jacob Vosmaer | 2016-02-02 | 1 | -1/+4 |
|\ | |||||
| * | Render sanitized SVG images | Stan Hu | 2016-02-01 | 1 | -1/+4 |
| | | | | | | | | Closes https://github.com/gitlabhq/gitlabhq/issues/9265 | ||||
* | | Move load command into _text partial | Jacob Vosmaer | 2016-02-02 | 2 | -1/+1 |
| | | |||||
* | | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into lazy-blobs | Jacob Vosmaer | 2016-02-01 | 78 | -234/+339 |
|\ \ | |/ | |||||
| * | Make "Two-factor" casing consistent throughout the applicationrs-two-factor-casing | Robert Speicher | 2016-01-31 | 2 | -4/+4 |
| | | |||||
| * | Merge branch 'rename-inline-diff' into 'master' | Robert Speicher | 2016-01-31 | 2 | -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 renamed | Douwe Maan | 2016-01-29 | 2 | -10/+14 |
| | | | |||||
| * | | Merge branch 'warn-admin-oauth' into 'master' | Douwe Maan | 2016-01-30 | 1 | -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.  See merge request !2601 | ||||
| | * | | Improve text on warning message | Zeger-Jan van de Weg | 2016-01-26 | 1 | -1/+3 |
| | | | | |||||
| | * | | Warn admin of granting admin rights during OAuth | Zeger-Jan van de Weg | 2016-01-26 | 1 | -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 Schatz | 2016-01-29 | 1 | -1/+1 |
| |\ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-focus emoji award search field  Closes #12621 cc. @jschatz1 See merge request !2650 | ||||
| | * | | Auto-focus emoji award search field | Phil Hughes | 2016-01-29 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | Closes #12621 | ||||
| * | | | Partially revert "Add IP check against DNSBLs at account sign-up"rs-remove-ip-blocking | Robert Speicher | 2016-01-28 | 1 | -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 Speicher | 2016-01-28 | 1 | -6/+4 |
| |\ \ | | | | | | | | | | | | | | | | | Fix highlighting in blame view. See merge request !2630 | ||||
| | * \ | Merge branch 'master' into highlight-blame | Douwe Maan | 2016-01-28 | 5 | -6/+5 |
| | |\ \ | |||||
| | * | | | Move blame group logic to dedicated class | Douwe Maan | 2016-01-28 | 1 | -2/+2 |
| | | | | | |||||
| | * | | | Fix highlighting in blame view. | Douwe Maan | 2016-01-27 | 1 | -4/+2 |
| | | | | | |||||
| * | | | | Merge branch 'issue_2406' into 'master' | Dmitriy Zaporozhets | 2016-01-28 | 7 | -10/+92 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Show list of forks for a given Project Closes #2406 See merge request !2376 | ||||
| | * | | | | Refactor some CSS rules. | Rubén Dávila | 2016-01-20 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | Some fixes from last code review. | Rubén Dávila | 2016-01-20 | 3 | -4/+4 |
| | | | | | | |||||
| | * | | | | Some CSS and sorting fixes. | Rubén Dávila | 2016-01-20 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | Add icon for private forks notice. #2406 | Rubén Dávila | 2016-01-20 | 1 | -1/+2 |
| | | | | | | |||||
| | * | | | | Add ability to sort forks. #2406 | Rubén Dávila | 2016-01-20 | 1 | -4/+5 |
| | | | | | | |||||
| | * | | | | aligns menu at top on one row | Jacob Schatz | 2016-01-20 | 1 | -10/+10 |
| | | | | | | |||||
| | * | | | | WIP: Add sort dropdown. #2406 | Rubén Dávila | 2016-01-20 | 1 | -0/+20 |
| | | | | | | |||||
| | * | | | | Little update to copy and custom content for empty results. #2406 | Rubén Dávila | 2016-01-20 | 1 | -8/+13 |
| | | | | | | |||||
| | * | | | | Show last commit as description. #2406 | Rubén Dávila | 2016-01-20 | 3 | -4/+10 |
| | | | | | | |||||
| | * | | | | Add ability to filter by namespace. #2406 | Rubén Dávila | 2016-01-20 | 1 | -11/+17 |
| | | | | | | |||||
| | * | | | | Use adequate icon for Forks link on sidebar. #2406 | Rubén Dávila | 2016-01-20 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | Show forks counter on listing. #2406 | Rubén Dávila | 2016-01-20 | 3 | -2/+10 |
| | | | | | | |||||
| | * | | | | Add fork button and implement ability to distinguish between public and ↵ | Rubén Dávila | 2016-01-20 | 1 | -1/+22 |
| | | | | | | | | | | | | | | | | | | | | | | | | protected forks. #2406 | ||||
| | * | | | | Use Project creator's avatar in fork listing. #2406 | Rubén Dávila | 2016-01-20 | 4 | -3/+10 |
| | | | | | | |||||
| | * | | | | Setup new fork link in sidebar and routes. #2406 | Rubén Dávila | 2016-01-20 | 5 | -6/+13 |
| | | | | | | |||||
| * | | | | | Removed sorted text from dropdowns | Phil Hughes | 2016-01-28 | 7 | -8/+7 |
| | |_|/ / | |/| | | | | | | | | | | | | | Closes #12796 | ||||
| * | | | | Merge branch 'events-performance' into 'master' | Robert Speicher | 2016-01-27 | 4 | -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-performance | Yorick Peterse | 2016-01-27 | 4 | -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 Zaporozhets | 2016-01-27 | 1 | -2/+1 |
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove link from system hook Closes #12672 See merge request !2588 | ||||
| | * | | | | Remove link from system hookrs-issue-12672 | Robert Speicher | 2016-01-24 | 1 | -2/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | Closes #12672 | ||||
| * | | | | | Merge branch 'fix/commit-status-artifacts' into 'master' | Kamil Trzciński | 2016-01-27 | 1 | -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 available | Grzegorz Bizon | 2016-01-26 | 1 | -1/+1 |
| | | |/ / | | |/| | | |||||
| * | | | | Fix visibility level texts on application settings | Zeger-Jan van de Weg | 2016-01-26 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | Introduced by me through !2005 | ||||
| * | | | | Save button on app settings now btn-save | Zeger-Jan van de Weg | 2016-01-26 | 3 | -4/+3 |
| |/ / / | |||||
| * | | | Merge branch 'note-highlighting' into 'master' | Robert Speicher | 2016-01-25 | 4 | -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-highlighting | Douwe Maan | 2016-01-25 | 4 | -8/+7 |
| | |/ / | |||||
| * | | | Substituted deprecated forum link with project issues link. [ci skip] | Jose Torres | 2016-01-25 | 1 | -3/+3 |
| | | | | |||||
| * | | | Distinguishes between search inputs. | Jacob Schatz | 2016-01-24 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | Main search input has different styles than secondary search inputs. | ||||
| * | | | Adds base64 background search icon. | Jacob Schatz | 2016-01-24 | 1 | -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 Schatz | 2016-01-23 | 5 | -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-bg | Dmitriy Zaporozhets | 2016-01-22 | 5 | -13/+12 |
| | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | | | Fix UI for pages with panelsfix-ui-padding | Dmitriy Zaporozhets | 2016-01-22 | 9 | -13/+9 |
| |/ / | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> |