Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix CHANGELOG and wrong conflict resolution | Rémy Coutable | 2016-10-06 | 1 | -1/+1 |
* | Merge commit 'dev/security' into 'master' | Rémy Coutable | 2016-10-06 | 4 | -12/+14 |
|\ | |||||
| * | Merge branch '22435-no-api-state-change-via-rails-session' into 'security' | Douwe Maan | 2016-09-28 | 4 | -13/+15 |
| |\ | |||||
| | * | Convert label creation from API to controller endpoint | Nick Thomas | 2016-09-23 | 4 | -13/+15 |
* | | | Merge branch 'flash-cherry-pick-error' into 'master' | Fatih Acet | 2016-10-05 | 1 | -7/+2 |
|\ \ \ | |||||
| * | | | Make flash-alert background transparent to match flash-notice.flash-cherry-pick-error | Bryce Johnson | 2016-10-05 | 1 | -7/+2 |
* | | | | Merge branch 'revert-c676283b' into 'master' | Fatih Acet | 2016-10-05 | 8 | -53/+150 |
|\ \ \ \ | |||||
| * | | | | Fix bad merge conflict resolution. | Fatih Acet | 2016-10-05 | 1 | -2/+0 |
| * | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into revert-c676283b... | Fatih Acet | 2016-10-05 | 1 | -1/+1 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into revert-c676283b...revert-c676283b | Fatih Acet | 2016-10-05 | 25 | -906/+819 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into revert-c676283b... | Fatih Acet | 2016-10-05 | 1 | -0/+19 |
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | |||||
| * | | | | | | Add position menu above ability to glDropdown. | Fatih Acet | 2016-10-04 | 5 | -35/+37 |
| * | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into revert-c676283b... | Fatih Acet | 2016-10-04 | 7 | -30/+73 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | Tweak issuable dropdowns to open above the dropdown. | Fatih Acet | 2016-10-04 | 1 | -0/+28 |
| * | | | | | | | Fix dropdown title when No Label selected. | Fatih Acet | 2016-10-04 | 2 | -23/+41 |
| * | | | | | | | Merge branch 'master' into revert-c676283b | Phil Hughes | 2016-10-04 | 5 | -18/+52 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'master' into revert-c676283b | Phil Hughes | 2016-10-03 | 134 | -704/+2053 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'master' into revert-c676283b | Phil Hughes | 2016-09-02 | 28 | -157/+236 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Fixed label toggle text | Phil Hughes | 2016-08-30 | 1 | -14/+17 |
| * | | | | | | | | | | Merge branch 'master' into revert-c676283b | Phil Hughes | 2016-08-30 | 381 | -11049/+17329 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Fixed up frontend code based on feedback | Phil Hughes | 2016-07-20 | 1 | -1/+1 |
| * | | | | | | | | | | | Uses the selected values from the controller not the params | Phil Hughes | 2016-07-20 | 1 | -2/+0 |
| * | | | | | | | | | | | Removes tick from no label when selecting a label | Phil Hughes | 2016-07-20 | 1 | -0/+6 |
| * | | | | | | | | | | | Fixed 'no label' being in dropdown toggle label | Phil Hughes | 2016-07-20 | 1 | -6/+4 |
| * | | | | | | | | | | | Remove unnecesary update.label event | Alfredo Sumaran | 2016-07-20 | 2 | -2/+0 |
| * | | | | | | | | | | | Fixed issuable sidebar label toggle not working | Phil Hughes | 2016-07-20 | 2 | -2/+2 |
| * | | | | | | | | | | | Gets value from native element rather than converting to jquery element | Phil Hughes | 2016-07-20 | 1 | -1/+1 |
| * | | | | | | | | | | | Updated how the label toggle gets the text | Phil Hughes | 2016-07-20 | 2 | -62/+18 |
| * | | | | | | | | | | | Added tests for new/edit issue form | Phil Hughes | 2016-07-20 | 1 | -2/+2 |
| * | | | | | | | | | | | Fixed failing label dropdown tests | Phil Hughes | 2016-07-20 | 1 | -1/+1 |
| * | | | | | | | | | | | Refactor label toggling for Labels dropdown | Alfredo Sumaran | 2016-07-20 | 2 | -25/+61 |
| * | | | | | | | | | | | Fix clearing fields not saving | Phil Hughes | 2016-07-20 | 1 | -1/+1 |
| * | | | | | | | | | | | Fixed label dropdown bugs with pre-selecting the toggle label | Phil Hughes | 2016-07-20 | 1 | -0/+1 |
| * | | | | | | | | | | | Fixed label dropdown not selecting no labels | Phil Hughes | 2016-07-20 | 1 | -0/+4 |
| * | | | | | | | | | | | GL dropdown default toggle color | Phil Hughes | 2016-07-20 | 5 | -6/+25 |
| * | | | | | | | | | | | Fix issue with label select not correctly showing selected values | Phil Hughes | 2016-07-20 | 2 | -16/+15 |
| * | | | | | | | | | | | Fix issue with milestone dropdown submitting the form without selected value | Phil Hughes | 2016-07-20 | 1 | -3/+4 |
| * | | | | | | | | | | | Use target_project instead of projectg | Phil Hughes | 2016-07-20 | 1 | -0/+2 |
| * | | | | | | | | | | | Revert "Merge branch 'revert-bdb6f1e6' into 'master'" | Phil Hughes | 2016-07-20 | 6 | -15/+35 |
* | | | | | | | | | | | | Merge branch 'fix_group_links_404' into 'master' | Fatih Acet | 2016-10-05 | 4 | -6/+8 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | fix group links 404 | barthc | 2016-10-05 | 4 | -6/+8 |
| | |_|_|_|_|_|/ / / / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Merge branch 'build-expire-sidebar' into 'master' | Fatih Acet | 2016-10-05 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | |||||
| * | | | | | | | | | | Correctly parse the date of artifact expiringbuild-expire-sidebar | Phil Hughes | 2016-10-05 | 1 | -1/+1 |
* | | | | | | | | | | | Merge branch '22295-grouped-pipeline-dropdown-should-be-a-scrollable-containe... | Fatih Acet | 2016-10-05 | 1 | -1/+3 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | added 245px max height and overflow scroll-y to .grouped-pipeline-dropdown | Dimitrie Hoekstra | 2016-10-05 | 1 | -1/+3 |
* | | | | | | | | | | | | Merge branch '19499-project-dropdowns' into 'master' | Annabel Dunstone Gray | 2016-10-05 | 1 | -1/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | 19499 Update project dropdowns19499-project-dropdowns | tauriedavis | 2016-10-04 | 1 | -1/+2 |
| | |_|/ / / / / / / / / | |/| | | | | | | | | | | |||||
* | | | | | | | | | | | | Merge branch 'desplacturing' into 'master' | Jacob Schatz | 2016-10-05 | 23 | -907/+810 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | Restore inexplicably removed code from requestFileSuccess.desplacturing | Bryce Johnson | 2016-10-05 | 4 | -11/+18 |
| * | | | | | | | | | | | Simplify TemplateSelector keyup/blur handler. | Bryce Johnson | 2016-10-05 | 1 | -5/+1 |