Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Don't break line in middle of wordword-break | Annabel Dunstone | 2016-04-21 | 3 | -1/+6 |
* | Merge branch 'doc-updating-gitlab' into 'master' | Achilleas Pipinellis | 2016-04-21 | 2 | -8/+167 |
|\ | |||||
| * | Split into sections, port `downgrade_ee_to_ce` doc from EEdoc-updating-gitlab | Achilleas Pipinellis | 2016-04-21 | 2 | -8/+164 |
| * | Fix links in update README | Achilleas Pipinellis | 2016-04-19 | 1 | -5/+8 |
* | | Merge branch 'test-db-migrate' into 'master' | Stan Hu | 2016-04-21 | 1 | -0/+5 |
|\ \ | |||||
| * | | Add db:migrate task to CI | Dmitriy Zaporozhets | 2016-04-21 | 1 | -0/+5 |
* | | | Merge branch 'instrument-gitlab-access' into 'master' | Rémy Coutable | 2016-04-21 | 2 | -0/+5 |
|\ \ \ | |/ / |/| | | |||||
| * | | Instrument Gitlab::GitAccess/GitAccessWiki | Yorick Peterse | 2016-04-21 | 2 | -0/+5 |
* | | | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce | Rémy Coutable | 2016-04-21 | 9 | -99/+155 |
|\ \ \ | |||||
| * \ \ | Merge branch 'label-dropdown-fix' into 'master' | Jacob Schatz | 2016-04-21 | 9 | -99/+155 |
| |\ \ \ | |||||
| | * \ \ | Merge remote-tracking branch 'origin/master' into label-dropdown-fixlabel-dropdown-fix | Alfredo Sumaran | 2016-04-20 | 58 | -191/+3448 |
| | |\ \ \ | |||||
| | * \ \ \ | Merge remote-tracking branch 'origin/master' into label-dropdown-fix | Alfredo Sumaran | 2016-04-20 | 2 | -15/+12 |
| | |\ \ \ \ | |||||
| | * \ \ \ \ | Merge remote-tracking branch 'origin/master' into label-dropdown-fix | Alfredo Sumaran | 2016-04-20 | 267 | -1053/+4251 |
| | |\ \ \ \ \ | |||||
| | * | | | | | | Move shared html to a partial | Alfredo Sumaran | 2016-04-18 | 3 | -34/+21 |
| | * | | | | | | Add is-link attribute to know if a menu item should not be stopped | Alfredo Sumaran | 2016-04-18 | 2 | -2/+2 |
| | * | | | | | | Remove $parent | Alfredo Sumaran | 2016-04-18 | 1 | -6/+5 |
| | * | | | | | | Add tests to check if a new label is added | Alfredo Sumaran | 2016-04-15 | 1 | -0/+79 |
| | * | | | | | | Fix create label functionality | Alfredo Sumaran | 2016-04-15 | 1 | -41/+25 |
| | * | | | | | | Fix Label dropdown and organize code | Alfredo Sumaran | 2016-04-15 | 5 | -6/+13 |
| | * | | | | | | Render proper partial | Alfredo Sumaran | 2016-04-15 | 2 | -2/+2 |
| | * | | | | | | Add spaces | Alfredo Sumaran | 2016-04-15 | 1 | -3/+3 |
| | * | | | | | | Reuse partial for Create Label page | Alfredo Sumaran | 2016-04-15 | 3 | -18/+21 |
| | * | | | | | | Restore broken code | Alfredo Sumaran | 2016-04-15 | 1 | -9/+6 |
* | | | | | | | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq | Rémy Coutable | 2016-04-21 | 2 | -2/+2 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | |||||
| * | | | | | | | Merge branch 'issue_15434' into 'master' | Jacob Schatz | 2016-04-21 | 2 | -2/+2 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | Remove unnecessary provided param | Alfredo Sumaran | 2016-04-21 | 1 | -1/+1 |
| | * | | | | | | | Remove unused param | Alfredo Sumaran | 2016-04-21 | 1 | -1/+1 |
* | | | | | | | | | Merge branch 'rs-issue-15408' into 'master' | Robert Speicher | 2016-04-21 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Fix undefined local variable error in Invalid MR templaters-issue-15408 | Robert Speicher | 2016-04-21 | 1 | -1/+1 |
| | |_|_|_|_|_|/ / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'diff-link-fix' into 'master' | Jacob Schatz | 2016-04-21 | 2 | -10/+10 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | Put back removed line numberdiff-link-fix | Phil Hughes | 2016-04-20 | 1 | -1/+1 |
| * | | | | | | | | Fixed issue when scrolling to element and there is an expander | Phil Hughes | 2016-04-20 | 1 | -2/+2 |
| * | | | | | | | | Fixed issue with lines not being selectable when expanding diff | Phil Hughes | 2016-04-20 | 1 | -5/+5 |
| * | | | | | | | | Fixed issue with incorrect line being highlighted if line is in discussion view | Phil Hughes | 2016-04-20 | 1 | -4/+4 |
| | |_|_|/ / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch '15445-file-renames' into 'master' | Jacob Schatz | 2016-04-21 | 1 | -0/+2 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | File name change appears on one line | Annabel Dunstone | 2016-04-21 | 1 | -0/+2 |
| | |/ / / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'note-username-text-color' into 'master' | Jacob Schatz | 2016-04-21 | 1 | -0/+3 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Fixed issue with author link color on dark diffsnote-username-text-color | Phil Hughes | 2016-04-21 | 1 | -0/+3 |
* | | | | | | | | | Merge branch 'sidekiq-memory-sigterm' into 'master' | Stan Hu | 2016-04-21 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | Use SIGTERM during Sidekiq memory shutdown | Jacob Vosmaer | 2016-04-21 | 1 | -2/+2 |
* | | | | | | | | | Merge branch 'fix/label-filters' into 'master' | Douwe Maan | 2016-04-21 | 4 | -31/+62 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | refactored specs based on feedbackfix/label-filters | James Lopez | 2016-04-21 | 2 | -31/+18 |
| * | | | | | | | | use wait_for_ajax instead of sleeping for 2 days! | James Lopez | 2016-04-21 | 1 | -10/+12 |
| * | | | | | | | | refactored specs, adding more scenarios | James Lopez | 2016-04-21 | 2 | -22/+34 |
| * | | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/label-filters | James Lopez | 2016-04-21 | 218 | -725/+5866 |
| |\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | final line missing | James Lopez | 2016-04-20 | 1 | -1/+1 |
| * | | | | | | | | | fix rubocop warning | James Lopez | 2016-04-20 | 1 | -2/+2 |
| * | | | | | | | | | udpated a few things based on MR feedback. Also added model spec | James Lopez | 2016-04-20 | 5 | -176/+203 |
| * | | | | | | | | | fix other spec failures | James Lopez | 2016-04-19 | 1 | -1/+1 |
| * | | | | | | | | | filter labels by including all filter titles as part of the query | James Lopez | 2016-04-19 | 3 | -2/+172 |