- 11 Aug, 2015 10 commits
-
-
Dmitriy Zaporozhets authored
This reverts commit 3d416f16.
-
Dmitriy Zaporozhets authored
This reverts commit 435f680b.
-
Dmitriy Zaporozhets authored
This reverts commit dfccb06d. Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-
Dmitriy Zaporozhets authored
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-
Dmitriy Zaporozhets authored
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-
Dmitriy Zaporozhets authored
This reverts commit d24c40ec.
-
Dmitriy Zaporozhets authored
This reverts commit 459e6d34, reversing changes made to 804168e1. Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-
Dmitriy Zaporozhets authored
This reverts commit 957e849f, reversing changes made to 6b9dbe9f. Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-
Dmitriy Zaporozhets authored
This reverts commit 4773f38e, reversing changes made to 0d5d80b7.
-
Dmitriy Zaporozhets authored
This reverts commit 151d9fb3, reversing changes made to 819d110c.
-
- 10 Aug, 2015 9 commits
-
-
Dmitriy Zaporozhets authored
Improve text of MR merge widget and manual merge modal Modal with manual merge instructions: ![Screen_Shot_2015-08-08_at_21.30.23](https://gitlab.com/gitlab-org/gitlab-ce/uploads/2bffe42e9ad76afd02efbe5816027767/Screen_Shot_2015-08-08_at_21.30.23.png) Archived: ![archived](https://gitlab.com/gitlab-org/gitlab-ce/uploads/e1efa1d54ce7ead8de6e88ca34095c09/archived.png) WIP: ![wip](https://gitlab.com/gitlab-org/gitlab-ce/uploads/14a831458d0946722559ec643f91678c/wip.png) Missing target branch: ![missing_branch](https://gitlab.com/gitlab-org/gitlab-ce/uploads/340083bbacbc234906e58cf76c586a9e/missing_branch.png) Missing source branch: ![missing_branch_source](https://gitlab.com/gitlab-org/gitlab-ce/uploads/72f80ed58efed88b2bbcf403b55b1a01/missing_branch_source.png) Nothing to merge: ![nothing](https://gitlab.com/gitlab-org/gitlab-ce/uploads/85b0d9da87acacd53cffd0df58d8eed4/nothing.png) Checking ability to merge: ![check](https://gitlab.com/gitlab-org/gitlab-ce/uploads/32d75322e622025610c446e8ca7d892d/check.png) Conflicts when allowed to merge: ![conflicts](https://gitlab.com/gitlab-org/gitlab-ce/uploads/23fdb2c60a27d873b3cc8a008203eb59/conflicts.png) Conflicts when not allowed to merge: ![conflicts_not_allowed](https://gitlab.com/gitlab-org/gitlab-ce/uploads/113462a80fc65bf48b20dc0efd808363/conflicts_not_allowed.png) Mergeable when allowed to merge: ![accept](https://gitlab.com/gitlab-org/gitlab-ce/uploads/1b3bb1a71df21728fe9318e7a083bfba/accept.png) Mergeable when not allowed to merge: ![not_allowed](https://gitlab.com/gitlab-org/gitlab-ce/uploads/d38fa5c96f8f9d7223bb6bc7ad36f29d/not_allowed.png) Merge in progress: ![locked](https://gitlab.com/gitlab-org/gitlab-ce/uploads/b60dcf5eb70e6032b0e8aac766018df3/locked.png) Merge failed: ![failed_2](https://gitlab.com/gitlab-org/gitlab-ce/uploads/3713b9a10298183935b028b658271ac9/failed_2.png) Merged: ![merged](https://gitlab.com/gitlab-org/gitlab-ce/uploads/7f68a48dd197a71351c9a80c59c8ecbe/merged.png) Closed: ![closed](https://gitlab.com/gitlab-org/gitlab-ce/uploads/d5ce040449b7db943bd2fbfffb607a10/closed.png) cc @dzaporozhets @rspeicher See merge request !1120
-
Dmitriy Zaporozhets authored
Trigger post-receive hooks after commits are made by GitLab Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !1127
-
Dmitriy Zaporozhets authored
Fix event cache Fixes #2236. See merge request !1128
-
Dmitriy Zaporozhets authored
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-
Douwe Maan authored
-
Dmitriy Zaporozhets authored
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-
Stan Hu authored
Add dropzone upload progress This MR adds upload progress in percents to dropzone. ![progress](https://gitlab.com/vernik91/gitlab-ce/uploads/9be251e4f3a99bc1d65435b1f001d021/progress.png) I thought, it can be nice small enhancement :) See merge request !1125
-
Nikita Verkhovin authored
-
Robert Speicher authored
Add `data-[type]-id` attribute to reference links This is to let us redact them later in another filter. See merge request !1110
-
- 09 Aug, 2015 11 commits
-
-
Stan Hu authored
link to configured gravatar host on profile page This MR updates the profile page to display the correct address for the configured gravatar service. Previously this always showed gravatar.com even if gravatar.com was not being used as the gravatar service. See merge request !1093
-
Douwe Maan authored
-
Douwe Maan authored
-
Douwe Maan authored
-
Dmitriy Zaporozhets authored
-
Dmitriy Zaporozhets authored
Ui improvements * revert of wrong patch * spall margin change Explanation with screenshots here - https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/579#note_1845510 See merge request !1117
-
Stan Hu authored
-
Stan Hu authored
Improve abuse report wording
-
Robert Speicher authored
Fix transparency for msapplication-tile image See merge request !1122
-
Robert Speicher authored
Cache all events Use CSS to determine if the current user needs to see "Congratulations! Tweet about it" by project creation events and "Create Merge Request" by push events. Implemented as described here: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/911#note_1559710 Addresses #2054, in part. cc @dzaporozhets See merge request !1103
-
Robert Speicher authored
[ci skip]
-
- 08 Aug, 2015 5 commits
-
-
Robert Speicher authored
This is to let us redact them later in another filter.
-
Douwe Maan authored
-
Douwe Maan authored
-
Douwe Maan authored
-
Stefan Tatschner authored
-
- 07 Aug, 2015 5 commits
-
-
Robert Speicher authored
See merge request !1077
-
Achilleas Pipinellis authored
-
Stan Hu authored
Fix CHANGELOG entries to belong in the right version Reorder entries that were improperly grouped (one fix mentioned in #1522). See merge request !1118
-
Stan Hu authored
-
Dmitriy Zaporozhets authored
This reverts commit ee0fc2c3.
-