Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #9839 from huacnlee/fix/add-author-info-into-note-messages | Stan Hu | 2015-12-11 | 1 | -0/+2 |
|\ | |||||
| * | Make sure notify email always has author info. | Jason Lee | 2015-11-18 | 1 | -0/+2 |
* | | Merge branch 'ui-right-sidebar' into 'master' | Dmitriy Zaporozhets | 2015-12-11 | 18 | -290/+342 |
|\ \ | |||||
| * | | Move awards back to gray panel and few improvements to sidebar | Dmitriy Zaporozhets | 2015-12-11 | 7 | -6/+7 |
| * | | Few UI improvements to new sidebar implementation | Dmitriy Zaporozhets | 2015-12-11 | 3 | -8/+13 |
| * | | Fix tests for new issuable sidebar | Dmitriy Zaporozhets | 2015-12-11 | 1 | -7/+10 |
| * | | Implement new sidebar for merge request page | Dmitriy Zaporozhets | 2015-12-11 | 10 | -92/+82 |
| * | | Make edit link on issuable sidebar works | Dmitriy Zaporozhets | 2015-12-11 | 1 | -2/+8 |
| * | | Redesign issue page for new sidebar | Dmitriy Zaporozhets | 2015-12-11 | 6 | -198/+97 |
| * | | Move awards css to separate file | Dmitriy Zaporozhets | 2015-12-11 | 1 | -0/+68 |
| * | | Implement issuable sidebar partial | Dmitriy Zaporozhets | 2015-12-11 | 1 | -0/+80 |
* | | | Merge branch 'fix-typo' into 'master' | Robert Speicher | 2015-12-11 | 1 | -1/+1 |
|\ \ \ | |/ / |/| | | |||||
| * | | Fix typo | Zeger-Jan van de Weg | 2015-12-10 | 1 | -1/+1 |
* | | | Merge branch 'mr-statuses' into 'master' | Robert Speicher | 2015-12-11 | 6 | -1/+59 |
|\ \ \ | |||||
| * | | | display referenced merge requests in issue description with CI statusgsmethells/gitlab-ce-mr-statuses | Greg Smethells | 2015-12-11 | 6 | -1/+59 |
* | | | | Merge branch 'fix-delete-notes-on-merge-request-diff' into 'master' | Robert Speicher | 2015-12-11 | 1 | -8/+16 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Remove note from MR discussion when deleting it in the changes tab | Douglas Barbosa Alexandre | 2015-12-10 | 1 | -8/+16 |
* | | | | Merge branch 'feature/project_js_from_ee' into 'master' | Douwe Maan | 2015-12-11 | 1 | -2/+5 |
|\ \ \ \ | |||||
| * | | | | Aling project js with EE | Borja Aparicio | 2015-12-10 | 1 | -2/+5 |
* | | | | | Merge branch 'complexity/rubocop-metrics' into 'master' | Douwe Maan | 2015-12-11 | 4 | -105/+39 |
|\ \ \ \ \ | |||||
| * | | | | | Fix specs by adding forgotten instance variable | Grzegorz Bizon | 2015-12-08 | 1 | -0/+3 |
| * | | | | | Remove obsolete variables in `repository_push_email` | Grzegorz Bizon | 2015-12-08 | 3 | -45/+32 |
| * | | | | | Improve Messagee::RepositoryPush | Grzegorz Bizon | 2015-12-08 | 1 | -3/+3 |
| * | | | | | Refactor RepositoryPush, move to Message namespace | Grzegorz Bizon | 2015-12-08 | 1 | -18/+20 |
| * | | | | | Make `can_send_from_user_email?` public in Notify | Grzegorz Bizon | 2015-12-08 | 1 | -2/+2 |
| * | | | | | Extract repository_push_email to separate class | Grzegorz Bizon | 2015-12-08 | 1 | -77/+19 |
* | | | | | | Fix award-emojis alert flash message | Grzegorz Bizon | 2015-12-11 | 3 | -13/+3 |
* | | | | | | emoji aliases problem | Valery Sizov | 2015-12-11 | 3 | -3/+10 |
* | | | | | | Merge branch 'zj/gitlab-ce-copying-file-seen-as-licence' | Douwe Maan | 2015-12-11 | 1 | -2/+18 |
|\ \ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'master' into copying-file-seen-as-licence | Zeger-Jan van de Weg | 2015-12-10 | 462 | -3492/+5768 |
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | |||||
| * | | | | | | Licence also accepted as license file | Zeger-Jan van de Weg | 2015-12-10 | 1 | -7/+15 |
| * | | | | | | Merge branch 'master' into copying-file-seen-as-licence | Zeger-Jan van de Weg | 2015-11-11 | 376 | -2354/+3977 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | Add specs on #license | Zeger-Jan van de Weg | 2015-10-15 | 1 | -1/+5 |
| * | | | | | | | 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 | 1 | -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 'report-errors-on-service-creation' of https://gitlab.com/stanhu... | Dmitriy Zaporozhets | 2015-12-10 | 1 | -2/+4 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Provide better diagnostic message upon project creation errors | Stan Hu | 2015-12-09 | 1 | -2/+4 |
* | | | | | | | | Merge branch 'fix-edit-notes-on-merge-request-diff' into 'master' | Robert Speicher | 2015-12-10 | 2 | -8/+13 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | 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 | 5 | -20/+26 |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |||||
| * | | | | | | | | 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 | 1 | -1/+1 |
| | |_|_|_|_|/ / | |/| | | | | | | |||||
* | | | | | | | | Merge remote-tracking branch 'origin/emoji_edit_disallow' | Dmitriy Zaporozhets | 2015-12-10 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | |||||
| * | | | | | | | Don't allow to edit award emoji commentsemoji_edit_disallow | Valery Sizov | 2015-12-10 | 1 | -1/+1 |
* | | | | | | | | Merge branch 'tmp-reference-pipeline-and-caching' into 'master' | Douwe Maan | 2015-12-10 | 21 | -72/+68 |
|\ \ \ \ \ \ \ \ |