Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Update CHANGELOGbackground-delete-process | Josh Frye | 2016-01-29 | 3 | -8/+6 |
* | First pass at deleting projects in the background. | Josh Frye | 2016-01-29 | 11 | -12/+49 |
* | Merge branch 'note-background-job' into 'master' | Dmitriy Zaporozhets | 2016-01-29 | 6 | -21/+72 |
|\ | |||||
| * | Fix Rubocop errornote-background-job | Josh Frye | 2016-01-28 | 1 | -3/+3 |
| * | Update tests | Josh Frye | 2016-01-28 | 2 | -3/+27 |
| * | [WIP] Background process note logic for #3948 | Josh Frye | 2016-01-28 | 4 | -18/+45 |
* | | Merge branch 'rs-remove-ip-blocking' into 'master' | Dmitriy Zaporozhets | 2016-01-29 | 10 | -235/+8 |
|\ \ | |||||
| * | | Partially revert "Add IP check against DNSBLs at account sign-up"rs-remove-ip-blocking | Robert Speicher | 2016-01-28 | 10 | -235/+8 |
* | | | Merge branch 'rs-transient-capybara-timeout' into 'master' | Dmitriy Zaporozhets | 2016-01-29 | 3 | -5/+26 |
|\ \ \ | |||||
| * | | | Prevent transient Capybara timeouts during feature testsrs-transient-capybara-timeout | Robert Speicher | 2016-01-28 | 3 | -5/+26 |
| |/ / | |||||
* | | | Merge branch 'rs-revert-revert-remove-coffee-filters' into 'master' | Dmitriy Zaporozhets | 2016-01-29 | 1 | -0/+6 |
|\ \ \ | |||||
| * | | | Revert "Revert "Remove the `:coffee` and `:coffeescript` Haml filters""rs-revert-revert-remove-coffee-filters | Robert Speicher | 2016-01-28 | 1 | -0/+6 |
* | | | | Merge branch 'hotfix/ruby-21-broken-update' into 'master' | Marin Jankovski | 2016-01-29 | 3 | -8/+8 |
|\ \ \ \ | |||||
| * | | | | add back master only for ruby 2.1 images | James Lopez | 2016-01-28 | 1 | -6/+4 |
| * | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into hotfix/ruby-21-... | James Lopez | 2016-01-28 | 40 | -313/+569 |
| |\ \ \ \ | | | |_|/ | | |/| | | |||||
| * | | | | trick rubocop and temporarily add ruby 2.1 images for any branch | James Lopez | 2016-01-28 | 4 | -12/+14 |
* | | | | | Make changes in config/initializers/1_settings.rb | Sytse Sijbrandij | 2016-01-28 | 1 | -0/+1 |
| |_|_|/ |/| | | | |||||
* | | | | Merge branch 'mr-merge-base' into 'master' | Robert Speicher | 2016-01-28 | 7 | -22/+24 |
|\ \ \ \ | |||||
| * \ \ \ | Merge branch 'master' into mr-merge-basemr-merge-base | Douwe Maan | 2016-01-28 | 45 | -95/+147 |
| |\ \ \ \ | |||||
| * | | | | | Fix specs | Douwe Maan | 2016-01-28 | 4 | -4/+7 |
| * | | | | | Correctly determine MR diff base when MR has merge conflicts | Douwe Maan | 2016-01-27 | 5 | -22/+19 |
* | | | | | | Merge branch 'highlight-blame' into 'master' | Robert Speicher | 2016-01-28 | 6 | -43/+84 |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | |||||
| * | | | | | Fix changeloghighlight-blame | Douwe Maan | 2016-01-28 | 1 | -3/+1 |
| * | | | | | Merge branch 'master' into highlight-blame | Douwe Maan | 2016-01-28 | 45 | -95/+147 |
| |\ \ \ \ \ | | | |/ / / | | |/| | | | |||||
| * | | | | | Move blame group logic to dedicated class | Douwe Maan | 2016-01-28 | 5 | -43/+81 |
| * | | | | | Fix highlighting in blame view. | Douwe Maan | 2016-01-27 | 3 | -4/+7 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge branch 'rs-ldap-user' into 'master' | Robert Speicher | 2016-01-28 | 1 | -7/+8 |
|\ \ \ \ \ | |||||
| * | | | | | Backport LDAP user assignment changes from EE | Robert Speicher | 2016-01-28 | 1 | -7/+8 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge branch 'update_sentry_gem' into 'master' | Robert Speicher | 2016-01-28 | 1 | -1/+1 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | |||||
| * | | | | Update sentry-raven gem.update_sentry_gem | Marin Jankovski | 2016-01-28 | 1 | -1/+1 |
| |/ / / | |||||
* | | | | Merge branch 'issue_2406' into 'master' | Dmitriy Zaporozhets | 2016-01-28 | 18 | -22/+205 |
|\ \ \ \ | |||||
| * | | | | Align filter dropdown.issue_2406 | Rubén Dávila | 2016-01-27 | 1 | -0/+4 |
| * | | | | Remove no longer required CSS rule. | Rubén Dávila | 2016-01-20 | 1 | -4/+0 |
| * | | | | Refactor some CSS rules. | Rubén Dávila | 2016-01-20 | 2 | -6/+17 |
| * | | | | Some fixes from last code review. | Rubén Dávila | 2016-01-20 | 4 | -5/+5 |
| * | | | | Some CSS and sorting fixes. | Rubén Dávila | 2016-01-20 | 3 | -19/+30 |
| * | | | | Fix broken spec. | Rubén Dávila | 2016-01-20 | 1 | -1/+3 |
| * | | | | Add specs for Forks listing. | Rubén Dávila | 2016-01-20 | 2 | -0/+40 |
| * | | | | Add icon for private forks notice. #2406 | Rubén Dávila | 2016-01-20 | 3 | -2/+16 |
| * | | | | Add ability to sort forks. #2406 | Rubén Dávila | 2016-01-20 | 2 | -4/+7 |
| * | | | | aligns menu at top on one row | Jacob Schatz | 2016-01-20 | 2 | -10/+26 |
| * | | | | changing projects css | Jacob Schatz | 2016-01-20 | 1 | -1/+0 |
| * | | | | 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 |
| * | | | | Fix broken specs. #2406 | Rubén Dávila | 2016-01-20 | 2 | -6/+4 |
| * | | | | Add ability to filter by namespace. #2406 | Rubén Dávila | 2016-01-20 | 2 | -12/+20 |
| * | | | | 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 prote... | Rubén Dávila | 2016-01-20 | 2 | -2/+26 |