Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Add hover-state for emoji in emoji-pickerimprove_emoji | Valery Sizov | 2015-12-11 | 2 | -1/+21 |
* | Merge branch 'fix/award-emoji-alert-width' into 'master' | Grzegorz Bizon | 2015-12-11 | 4 | -13/+4 |
|\ | |||||
| * | Update changelog | Grzegorz Bizon | 2015-12-11 | 1 | -0/+1 |
| * | Fix award-emojis alert flash message | Grzegorz Bizon | 2015-12-11 | 3 | -13/+3 |
|/ | |||||
* | Merge branch 'emoji_aliases' into 'master' | Valery Sizov | 2015-12-11 | 6 | -3/+55 |
|\ | |||||
| * | emoji aliases problem | Valery Sizov | 2015-12-11 | 6 | -3/+55 |
|/ | |||||
* | Merge branch 'zj/gitlab-ce-copying-file-seen-as-licence' | Douwe Maan | 2015-12-11 | 3 | -3/+39 |
|\ | |||||
| * | Target right release | Zeger-Jan van de Weg | 2015-12-10 | 1 | -1/+1 |
| * | Merge branch 'master' into copying-file-seen-as-licence | Zeger-Jan van de Weg | 2015-12-10 | 1055 | -9051/+18539 |
| |\ | |||||
| * | | Licence also accepted as license file | Zeger-Jan van de Weg | 2015-12-10 | 3 | -9/+26 |
| * | | Set changelog item to right release | Zeger-Jan van de Weg | 2015-11-11 | 1 | -1/+1 |
| * | | Merge branch 'master' into copying-file-seen-as-licence | Zeger-Jan van de Weg | 2015-11-11 | 653 | -4489/+10685 |
| |\ \ | |||||
| * | | | Add specs on #license | Zeger-Jan van de Weg | 2015-10-15 | 3 | -2/+17 |
| * | | | Add changelog line to right release | Zeger-Jan van de Weg | 2015-10-14 | 1 | -2/+1 |
| * | | | Prefer Licence over Copying | Zeger-Jan van de Weg | 2015-10-14 | 1 | -3/+7 |
| * | | | COPYING is now also accepted as licence file | Zeger-Jan van de Weg | 2015-10-14 | 2 | -3/+5 |
* | | | | Merge branch 'rs-update-gitlab_emoji' into 'master' | Valery Sizov | 2015-12-11 | 2 | -2/+2 |
|\ \ \ \ | |||||
| * | | | | Bump gitlab_emoji to ~> 0.2.0rs-update-gitlab_emoji | Robert Speicher | 2015-12-05 | 2 | -2/+2 |
* | | | | | Update CHANGELOG for 7bb8bb85 | Stan Hu | 2015-12-10 | 1 | -0/+1 |
* | | | | | Merge branch 'auth_hash_fix' into 'master' | Stan Hu | 2015-12-11 | 2 | -3/+3 |
|\ \ \ \ \ | |||||
| * | | | | | AuthHash should not parameterize email user | Corey Hinshaw | 2015-12-10 | 2 | -3/+3 |
* | | | | | | Merge branch 'remove_check_icon_from_mr_page' into 'master' | Dmitriy Zaporozhets | 2015-12-11 | 1 | -1/+0 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Remove check icon from merged requestsremove_check_icon_from_mr_page | Achilleas Pipinellis | 2015-12-10 | 1 | -1/+0 |
* | | | | | | | Merge branch 'bump-devise-3.5.3' into 'master' | Dmitriy Zaporozhets | 2015-12-11 | 3 | -3/+4 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Bump devise to 3.5.3 to fix reset token expiring after account creation | Stan Hu | 2015-12-10 | 3 | -3/+4 |
* | | | | | | | | Merge pull request #9850 from davydovanton/doc-fix-typos | Stan Hu | 2015-12-10 | 5 | -7/+7 |
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | |||||
| * | | | | | | | Fix typos in all docs [skip ci] | Anton Davydov | 2015-11-24 | 5 | -7/+7 |
* | | | | | | | | Merge branch 'user_file_uploads_documentation' into 'master' | Achilleas Pipinellis | 2015-12-10 | 2 | -1/+13 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Document file upload random uuid security | Drew Blessing | 2015-12-10 | 2 | -1/+13 |
| | |_|_|_|_|_|/ | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'feature/sidekiq-4' into 'master' | Dmitriy Zaporozhets | 2015-12-10 | 4 | -9/+21 |
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | |||||
| * | | | | | | | Upgraded Sidekiq to 4.xfeature/sidekiq-4 | Gabriel Mazetto | 2015-12-10 | 4 | -9/+21 |
* | | | | | | | | Merge branch 'report-errors-on-service-creation' of https://gitlab.com/stanhu... | Dmitriy Zaporozhets | 2015-12-10 | 3 | -2/+13 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Add spec for invalid options in project creation | Stan Hu | 2015-12-09 | 1 | -0/+7 |
| * | | | | | | | | Provide better diagnostic message upon project creation errors | Stan Hu | 2015-12-09 | 2 | -2/+5 |
* | | | | | | | | | Merge branch 'fix-edit-notes-on-merge-request-diff' into 'master' | Robert Speicher | 2015-12-10 | 5 | -8/+49 |
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | Make selectors more specific when scroll to element | Douglas Barbosa Alexandre | 2015-12-10 | 1 | -1/+1 |
| * | | | | | | | | Make selectors more specific when setting the tab content | Douglas Barbosa Alexandre | 2015-12-10 | 1 | -3/+3 |
| * | | | | | | | | USe innerHtml to avoid slow performance on a MR with very large difffix-edit-notes-on-merge-request-diff | Douglas Barbosa Alexandre | 2015-12-10 | 1 | -3/+2 |
| * | | | | | | | | Merge branch 'master' into fix-edit-notes-on-merge-request-diff | Douglas Barbosa Alexandre | 2015-12-09 | 232 | -233/+453 |
| |\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Update CHANGELOG | Douglas Barbosa Alexandre | 2015-12-09 | 1 | -0/+1 |
| * | | | | | | | | | Ensure new notes are highlighted properly on a merge request diff | Douglas Barbosa Alexandre | 2015-12-09 | 1 | -3/+7 |
| * | | | | | | | | | Ensure existing notes are highlighted properly on a merge request diff | Douglas Barbosa Alexandre | 2015-12-09 | 1 | -1/+3 |
| * | | | | | | | | | Ensure notes are replaced on a merge request diff when they're updated | Douglas Barbosa Alexandre | 2015-12-09 | 3 | -1/+36 |
* | | | | | | | | | | Merge remote-tracking branch 'origin/emoji_edit_disallow' | Dmitriy Zaporozhets | 2015-12-10 | 3 | -1/+19 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | Don't allow to edit award emoji commentsemoji_edit_disallow | Valery Sizov | 2015-12-10 | 3 | -1/+19 |
* | | | | | | | | | | Merge branch 'add-changelog-items' into 'master' | Robert Speicher | 2015-12-10 | 1 | -1/+8 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | Add missing changelog itemsadd-changelog-items | Douwe Maan | 2015-12-10 | 1 | -1/+8 |
* | | | | | | | | | | Merge branch 'tmp-reference-pipeline-and-caching' into 'master' | Douwe Maan | 2015-12-10 | 100 | -2551/+2662 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | |||||
| * | | | | | | | | | Merge branch 'master' into tmp-reference-pipeline-and-cachingtmp-reference-pipeline-and-caching | Douwe Maan | 2015-12-10 | 351 | -873/+2656 |
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |||||
| * | | | | | | | | | Merge branch 'reference-pipeline-and-caching' into 'master' | Robert Speicher | 2015-12-08 | 100 | -2551/+2662 |
| |\ \ \ \ \ \ \ \ \ |