summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* Fewer html_safesrename-inline-diffDouwe Maan2016-01-301-2/+2
|
* Mark inline difference between old and new paths when a file is renamedDouwe Maan2016-01-294-11/+50
|
* Merge branch 'rs-remove-ip-blocking' into 'master' Dmitriy Zaporozhets2016-01-294-25/+0
|\ | | | | | | | | | | | | | | Partially revert "Add IP check against DNSBLs at account sign-up" This partially reverts 6a5cd3ca - we keep the migration and add a new migration that reverts it in order to keep migration history intact. See merge request !2643
| * Partially revert "Add IP check against DNSBLs at account sign-up"rs-remove-ip-blockingRobert Speicher2016-01-284-25/+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 'hotfix/ruby-21-broken-update' into 'master' Marin Jankovski2016-01-292-2/+2
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵James Lopez2016-01-2825-29/+194
| |\ | | | | | | | | | hotfix/ruby-21-broken-update
| * | trick rubocop and temporarily add ruby 2.1 images for any branchJames Lopez2016-01-282-2/+2
| | |
* | | Merge branch 'mr-merge-base' into 'master' Robert Speicher2016-01-285-21/+22
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Correctly determine MR diff base when MR has merge conflicts Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/12779 See merge request !2632
| * \ \ Merge branch 'master' into mr-merge-basemr-merge-baseDouwe Maan2016-01-2821-36/+39
| |\ \ \
| * | | | Fix specsDouwe Maan2016-01-283-3/+6
| | | | |
| * | | | Correctly determine MR diff base when MR has merge conflictsDouwe Maan2016-01-274-20/+18
| | | | |
* | | | | Merge branch 'highlight-blame' into 'master' Robert Speicher2016-01-282-29/+5
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix highlighting in blame view. See merge request !2630
| * \ \ \ \ Merge branch 'master' into highlight-blameDouwe Maan2016-01-2821-36/+39
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| * | | | | Move blame group logic to dedicated classDouwe Maan2016-01-282-29/+3
| | | | | |
| * | | | | Fix highlighting in blame view.Douwe Maan2016-01-272-4/+6
| | |/ / / | |/| | |
* | | | | Merge branch 'rs-ldap-user' into 'master' Robert Speicher2016-01-281-7/+8
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | Backport LDAP user assignment changes from EE See https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/146 See merge request !2641
| * | | | Backport LDAP user assignment changes from EERobert Speicher2016-01-281-7/+8
| | |_|/ | |/| | | | | | | | | | See https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/146
* | | | Merge branch 'issue_2406' into 'master' Dmitriy Zaporozhets2016-01-2813-18/+159
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Show list of forks for a given Project Closes #2406 See merge request !2376
| * | | | Align filter dropdown.issue_2406Rubén Dávila2016-01-271-0/+4
| | | | |
| * | | | Remove no longer required CSS rule.Rubén Dávila2016-01-201-4/+0
| | | | |
| * | | | Refactor some CSS rules.Rubén Dávila2016-01-202-6/+17
| | | | |
| * | | | Some fixes from last code review.Rubén Dávila2016-01-204-5/+5
| | | | |
| * | | | Some CSS and sorting fixes.Rubén Dávila2016-01-203-19/+30
| | | | |
| * | | | Add icon for private forks notice. #2406Rubén Dávila2016-01-203-2/+16
| | | | |
| * | | | Add ability to sort forks. #2406Rubén Dávila2016-01-202-4/+7
| | | | |
| * | | | aligns menu at top on one rowJacob Schatz2016-01-202-10/+26
| | | | |
| * | | | changing projects cssJacob Schatz2016-01-201-1/+0
| | | | |
| * | | | 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
| | | | |
| * | | | Fix broken specs. #2406Rubén Dávila2016-01-201-4/+2
| | | | |
| * | | | Add ability to filter by namespace. #2406Rubén Dávila2016-01-202-12/+20
| | | | |
| * | | | 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-202-2/+26
| | | | | | | | | | | | | | | | | | | | protected forks. #2406
| * | | | Use Project creator's avatar in fork listing. #2406Rubén Dávila2016-01-205-4/+12
| | | | |
| * | | | Setup new fork link in sidebar and routes. #2406Rubén Dávila2016-01-208-9/+19
| | | | |
* | | | | Merge branch 'issue_5546' into 'master' Dmitriy Zaporozhets2016-01-282-2/+23
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Save list sort in a cookie Closes #5546 See merge request !2537
| * | | | | Make default sorting preference work for Issues and MRs.issue_5546Rubén Dávila2016-01-221-4/+2
| | | | | |
| * | | | | Merge branch 'master' into issue_5546Rubén Dávila2016-01-2293-468/+632
| |\ \ \ \ \
| * | | | | | Make sorting preference reusable for all projects.Rubén Dávila2016-01-225-14/+15
| | | | | | |
| * | | | | | Make cookie suffix more simpler.Rubén Dávila2016-01-211-2/+2
| | | | | | |
| * | | | | | Little refactor plus some specs.Rubén Dávila2016-01-211-12/+6
| | | | | | |
| * | | | | | Remember last sort option used.Rubén Dávila2016-01-205-2/+30
| | | | | | |
* | | | | | | Merge branch 'sort-text-removed-from-sort-dropdown' into 'master' Jacob Schatz2016-01-287-8/+7
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | Removed sorted text from dropdownsPhil Hughes2016-01-287-8/+7
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | Closes #12796
* | | | | | Merge branch 'numbered-list-rendering-in-comments-cuts-off' into 'master' Dmitriy Zaporozhets2016-01-281-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | Makes ol margin big enough for 3 digits.numbered-list-rendering-in-comments-cuts-offJacob Schatz2016-01-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #7960
* | | | | | | Merge branch 'feature/jschatz1/instant-issuable-history' into 'master' Dmitriy Zaporozhets2016-01-282-0/+4
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds feature: Ajax Close/Open updates discussion automatically Triggers jQuery event <br/> Fixes #5544 See merge request !2610
| * | | | | | Adds comment about event listenerfeature/jschatz1/instant-issuable-historyJacob Schatz2016-01-261-0/+1
| | | | | | |
View Lorry Controller Status