Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Remove notification level fild from users, improve migrations and specsissue_3359_2 | Felipe Artur | 2016-06-10 | 1 | -8/+5 |
* | Remove notification level from user model | Felipe Artur | 2016-06-10 | 1 | -4/+20 |
* | Allow or not merge MR with failed build | Rui Anderson | 2016-06-10 | 1 | -1/+1 |
* | Merge branch '18019-fix-wiki-linking' into 'master' | Rémy Coutable | 2016-06-09 | 1 | -1/+1 |
|\ | |||||
| * | Hook up the updated `WikiLinkFilter` to the wiki controllers. | Timothy Andrew | 2016-06-09 | 1 | -1/+1 |
* | | Merge branch 'git-http-no-authenticity-token' into 'master' | Robert Speicher | 2016-06-08 | 1 | -0/+2 |
|\ \ | |||||
| * | | Skip authenticity token checks for Git HTTP | Jacob Vosmaer | 2016-06-08 | 1 | -0/+2 |
* | | | Merge branch '14098-customize-after-sign-up-path' into 'master' | Robert Speicher | 2016-06-08 | 1 | -0/+1 |
|\ \ \ | |||||
| * | | | Allow custom text on 'almost there' page | Sean McGivern | 2016-06-08 | 1 | -0/+1 |
| |/ / | |||||
* | | | Merge branch 'password-min-length-placeholder' into 'master' | Robert Speicher | 2016-06-08 | 1 | -0/+1 |
|\ \ \ | |/ / |/| | | |||||
| * | | Added minimum password length to password fieldpassword-min-length-placeholder | Phil Hughes | 2016-06-03 | 1 | -0/+1 |
* | | | Merge branch 'git-http-controller' into 'master' | Rémy Coutable | 2016-06-08 | 2 | -40/+147 |
|\ \ \ | |||||
| * \ \ | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into git-htt... | Jacob Vosmaer | 2016-06-08 | 15 | -96/+251 |
| |\ \ \ | |||||
| * | | | | Remove code duplication in JwtController | Jacob Vosmaer | 2016-06-06 | 1 | -39/+1 |
| * | | | | Remove instances of Auth.new | Jacob Vosmaer | 2016-06-03 | 1 | -1/+1 |
| * | | | | Fewer silly instance variables | Jacob Vosmaer | 2016-06-03 | 1 | -11/+9 |
| * | | | | Use #present? | Jacob Vosmaer | 2016-06-03 | 1 | -1/+1 |
| * | | | | Refactor _allowed? methods as Rémy asked | Jacob Vosmaer | 2016-06-03 | 1 | -15/+9 |
| * | | | | Changes after more review from Rémy | Jacob Vosmaer | 2016-06-03 | 1 | -7/+9 |
| * | | | | Merge branch 'master' into git-http-controller | Jacob Vosmaer | 2016-06-02 | 58 | -246/+622 |
| |\ \ \ \ | | | |_|/ | | |/| | | |||||
| * | | | | Make CI/Oauth/rate limiting reusable | Jacob Vosmaer | 2016-04-29 | 1 | -70/+8 |
| * | | | | More changes suggested by Rémy | Jacob Vosmaer | 2016-04-25 | 1 | -19/+17 |
| * | | | | Don't mess up our parent controller | Jacob Vosmaer | 2016-04-22 | 2 | -30/+28 |
| * | | | | Some changes after review from Rémy and Valery | Jacob Vosmaer | 2016-04-22 | 1 | -28/+33 |
| * | | | | Comment and whitespace | Jacob Vosmaer | 2016-04-15 | 1 | -9/+20 |
| * | | | | Avoid path helper name clash | Jacob Vosmaer | 2016-04-15 | 1 | -4/+4 |
| * | | | | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into git-htt... | Jacob Vosmaer | 2016-04-15 | 12 | -67/+118 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into git-htt... | Jacob Vosmaer | 2016-04-12 | 21 | -77/+164 |
| |\ \ \ \ \ | |||||
| * | | | | | | Clarify intentions | Jacob Vosmaer | 2016-04-06 | 1 | -4/+7 |
| * | | | | | | Move workhorse protocol code into lib | Jacob Vosmaer | 2016-04-06 | 1 | -8/+5 |
| * | | | | | | Add some upload specs | Jacob Vosmaer | 2016-03-24 | 1 | -7/+29 |
| * | | | | | | Get Grack::Auth tests to pass | Jacob Vosmaer | 2016-03-23 | 2 | -5/+184 |
* | | | | | | | Fix endless redirections when accessing user OAuth applications when they are... | Stan Hu | 2016-06-08 | 1 | -1/+1 |
| |_|_|_|/ / |/| | | | | | |||||
* | | | | | | Merge branch 'issue_14189' into 'master' | Jacob Schatz | 2016-06-07 | 1 | -2/+27 |
|\ \ \ \ \ \ | |||||
| * | | | | | | add :set_priorities to :authorize_admin_labels! | Alfredo Sumaran | 2016-06-06 | 1 | -1/+1 |
| * | | | | | | Remove unnecesary param | Alfredo Sumaran | 2016-06-06 | 1 | -1/+1 |
| * | | | | | | Update method and route | Alfredo Sumaran | 2016-06-06 | 1 | -2/+2 |
| * | | | | | | Add unprioritized scope | Alfredo Sumaran | 2016-06-06 | 1 | -2/+2 |
| * | | | | | | Improve Issuable.order_labels_priority | Rémy Coutable | 2016-06-06 | 1 | -5/+10 |
| * | | | | | | Sort by label priority | Thijs Wouters | 2016-06-06 | 1 | -1/+1 |
| * | | | | | | Prioritize labels functionality | Alfredo Sumaran | 2016-06-06 | 1 | -1/+21 |
* | | | | | | | Merge branch 'zj-workhorse-to-serve-diffs' into 'master' 14722-searching-for-usernames-should-only-be-possible-for-search-strings-with-a-valid-format | Jacob Vosmaer (GitLab) | 2016-06-07 | 1 | -3/+10 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Workhorse to serve raw diffs | Zeger-Jan van de Weg | 2016-06-03 | 1 | -3/+10 |
* | | | | | | | | Rename @ci_commit to @pipeline in MergeRequestControllerrename-ci-commit-phase-3 | Kamil Trzcinski | 2016-06-07 | 1 | -4/+4 |
* | | | | | | | | Merge branch 'rename-ci-commit-phase-2' into rename-ci-commit-phase-3 | Kamil Trzcinski | 2016-06-06 | 2 | -1/+13 |
|\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge remote-tracking branch 'origin/master' into rename-ci-commit-phase-2 | Kamil Trzcinski | 2016-06-06 | 2 | -1/+13 |
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | |||||
| | * | | | | | | | Merge branch 'notes-are-awardables' into 'master' | Douwe Maan | 2016-06-06 | 2 | -1/+13 |
| | |\ \ \ \ \ \ \ | |||||
| | | * | | | | | | | Backend awardables on comments | ZJ van de Weg | 2016-06-06 | 2 | -1/+13 |
* | | | | | | | | | | Merge branch 'rename-ci-commit-phase-2' into rename-ci-commit-phase-3 | Kamil Trzcinski | 2016-06-06 | 7 | -39/+128 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | |||||
| * | | | | | | | | | Use `@ci_commit` in merge_request_controller | Kamil Trzcinski | 2016-06-06 | 1 | -4/+4 |