Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'feature/snumb130/hide-future-blocks-on-graph' into 'master' | Robert Speicher | 2016-04-24 | 4 | -3/+8 |
|\ | |||||
| * | Updating cal-heatmap-rails gem to 3.6.0 and hiding future dates. | Luke Howell | 2016-04-24 | 4 | -3/+8 |
* | | Merge branch 'rs-todo-middle-click' into 'master' | Jacob Schatz | 2016-04-24 | 1 | -1/+2 |
|\ \ | |/ |/| | |||||
| * | Allow middle-click on a Todo row to open in a new tab | Robert Speicher | 2016-04-24 | 1 | -1/+2 |
|/ | |||||
* | Merge branch 'add-tags-to-fetch' into 'master' | Achilleas Pipinellis | 2016-04-23 | 1 | -1/+1 |
|\ | |||||
| * | Add --tags to fetching gitlab-shell to ensure tags are downloaded | Stan Hu | 2016-04-22 | 1 | -1/+1 |
|/ | |||||
* | Merge branch 'upgrade-sidekiq' into 'master' | Robert Speicher | 2016-04-22 | 1 | -4/+3 |
|\ | |||||
| * | Update Sidekiq and related gems (bundle update sidekiq) | Stan Hu | 2016-04-19 | 1 | -4/+3 |
* | | Merge branch 'rs-update-binstubs' into 'master' | Robert Speicher | 2016-04-22 | 6 | -10/+30 |
|\ \ | |||||
| * | | Re-generate Spring binstubs for updated version of Spring | Robert Speicher | 2016-04-22 | 6 | -10/+30 |
|/ / | |||||
* | | Merge branch 'ha_docs' into 'master' | Drew Blessing | 2016-04-22 | 1 | -1/+1 |
|\ \ | |||||
| * | | Fix link | Drew Blessing | 2016-04-22 | 1 | -1/+1 |
* | | | Merge branch 'ha_docs' into 'master' | Drew Blessing | 2016-04-22 | 7 | -0/+524 |
|\ \ \ | |/ / | |||||
| * | | New HA docs [ci skip] | Drew Blessing | 2016-04-22 | 7 | -0/+524 |
|/ / | |||||
* | | Merge branch 'sidekiq_troubleshooting' into 'master' | Drew Blessing | 2016-04-22 | 2 | -0/+163 |
|\ \ | |||||
| * | | Add Sidekiq troubleshooting docs [ci skip] | Drew Blessing | 2016-04-22 | 2 | -0/+163 |
* | | | Merge branch 'rs-todos-feature-spec' into 'master' | Robert Speicher | 2016-04-22 | 1 | -18/+20 |
|\ \ \ | |||||
| * | | | Refactor Todos feature spec to be faster and less brittle | Robert Speicher | 2016-04-22 | 1 | -18/+20 |
* | | | | Merge branch '15513-fix-undefined-can-method' into 'master' | Robert Speicher | 2016-04-22 | 3 | -2/+25 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Use the `can?` helper instead of `current_user.can?`15513-fix-undefined-can-method | Rémy Coutable | 2016-04-22 | 3 | -2/+25 |
* | | | | Merge branch 'escape-label-title' into 'master' | Jacob Schatz | 2016-04-22 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | Escapes label title in filtersescape-label-title | Phil Hughes | 2016-04-22 | 1 | -1/+1 |
| |/ / / | |||||
* | | | | Merge branch 'fix/cherry-pick-specs-location' into 'master' | Robert Speicher | 2016-04-22 | 1 | -0/+0 |
|\ \ \ \ | |||||
| * | | | | Move cherry-pick feature specs to proper directoryfix/cherry-pick-specs-location | Grzegorz Bizon | 2016-04-22 | 1 | -0/+0 |
| |/ / / | |||||
* | | | | Merge branch 'doc/gitlab-shell-tag' into 'master' | Achilleas Pipinellis | 2016-04-22 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | Bump gitlab-shell to 2.7.2 | Achilleas Pipinellis | 2016-04-22 | 1 | -1/+1 |
| |/ / / | |||||
* | | | | Merge branch 'issue_3799' into 'master' | Rémy Coutable | 2016-04-22 | 2 | -30/+27 |
|\ \ \ \ | |||||
| * \ \ \ | Merge remote-tracking branch 'origin/master' into issue_3799 | Alfredo Sumaran | 2016-04-22 | 36 | -63/+253 |
| |\ \ \ \ | | |/ / / | |||||
| * | | | | Add tests for filtering owned projectsissue_3799 | Alfredo Sumaran | 2016-04-22 | 2 | -30/+27 |
* | | | | | Merge branch 'fix-issue-with-assignee-not-updating' into 'master' | Dmitriy Zaporozhets | 2016-04-22 | 3 | -2/+23 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | Fixed issue with assignee object not being returned | Phil Hughes | 2016-04-22 | 3 | -2/+23 |
|/ / / / | |||||
* | | | | Merge branch 'issue_3799' into 'master' | Rémy Coutable | 2016-04-22 | 4 | -1/+43 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge remote-tracking branch 'origin/master' into issue_3799 | Alfredo Sumaran | 2016-04-21 | 309 | -1422/+4992 |
| |\ \ \ | |||||
| * | | | | Update CHANGELOG | Alfredo Sumaran | 2016-04-21 | 1 | -0/+1 |
| * | | | | Do not display filters if user if there's no current_user | Alfredo Sumaran | 2016-04-21 | 1 | -7/+8 |
| * | | | | Use compact syntax | Alfredo Sumaran | 2016-04-21 | 1 | -4/+1 |
| * | | | | Add tests | Alfredo Sumaran | 2016-04-18 | 1 | -0/+30 |
| * | | | | Remove Spinach feature | Alfredo Sumaran | 2016-04-18 | 2 | -19/+0 |
| * | | | | Allow filtering by Owned projects | Alfredo Sumaran | 2016-04-18 | 4 | -1/+33 |
* | | | | | Merge branch 'doc-gh-import-additions' into 'master' | Achilleas Pipinellis | 2016-04-22 | 1 | -5/+9 |
|\ \ \ \ \ | |||||
| * | | | | | Add newest enhancements to GH importer docs | Achilleas Pipinellis | 2016-04-22 | 1 | -5/+9 |
* | | | | | | Merge branch 'confirmation-screen' into 'master' | Robert Speicher | 2016-04-22 | 9 | -4/+64 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Improved confirmation UXconfirmation-screen | Phil Hughes | 2016-04-21 | 9 | -4/+64 |
| |/ / / / / | |||||
* | | | | | | Merge branch 'doc_note_cherry_pick' into 'master' | Achilleas Pipinellis | 2016-04-22 | 1 | -1/+2 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Use new Note styleguide | Achilleas Pipinellis | 2016-04-22 | 1 | -1/+2 |
| |/ / / / / | |||||
* | | | | | | Merge branch 'rs-diff_view' into 'master' | Rémy Coutable | 2016-04-22 | 5 | -12/+29 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Clarify that the diff view setting always comes from the cookiers-diff_view | Robert Speicher | 2016-04-19 | 2 | -10/+1 |
| * | | | | | | Always read diff_view setting from the cookie | Robert Speicher | 2016-04-14 | 3 | -2/+28 |
* | | | | | | | Merge branch 'fix/private-labels-permissions' into 'master' | Grzegorz Bizon | 2016-04-22 | 6 | -23/+93 |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | |||||
| * | | | | | | Add Changelog entry for private labels security fix | Grzegorz Bizon | 2016-04-22 | 1 | -0/+1 |