summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | | | | | | Make #diffs safe (limited) by defaultJacob Vosmaer2016-02-2915-32/+19
| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | We no longer have a timeout flagJacob Vosmaer2016-02-261-2/+3
| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Convert enumerator to hashJacob Vosmaer2016-02-261-1/+1
| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Use include not eq in hash assertionJacob Vosmaer2016-02-261-2/+2
| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Fix "diffs" calls in specsJacob Vosmaer2016-02-264-4/+4
| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | RubocopJacob Vosmaer2016-02-262-4/+4
| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | No need for compare_failedJacob Vosmaer2016-02-263-22/+13
| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | No need for @compareJacob Vosmaer2016-02-261-1/+0
| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Fixes caught by failing testsJacob Vosmaer2016-02-2610-24/+16
| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Fix broken mergeJacob Vosmaer2016-02-261-2/+2
| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Update gitlab_gitJacob Vosmaer2016-02-261-1/+1
| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Refactor diff finding in NoteJacob Vosmaer2016-02-261-14/+10
| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Move diff options aroundJacob Vosmaer2016-02-263-17/+21
| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | RubocopJacob Vosmaer2016-02-261-5/+8
| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Return an Enumerator from Diff::ParserJacob Vosmaer2016-02-262-40/+41
| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Make more use of DiffHelperJacob Vosmaer2016-02-2611-46/+49
| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Revert "Make real_size an integer"Jacob Vosmaer2016-02-262-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit b0d914d44a73a3c3e211deaa5c83fec619c85a62.
* | | | | | | | | | | | | | | | | | | Update gitlab_gitJacob Vosmaer2016-02-261-1/+1
| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Make real_size an integerJacob Vosmaer2016-02-262-2/+2
| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Fix note diff searchJacob Vosmaer2016-02-251-1/+1
| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Update gitlab_gitJacob Vosmaer2016-02-251-1/+1
| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Use less to_aJacob Vosmaer2016-02-258-20/+15
| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Remove mysterious schema changesJacob Vosmaer2016-02-251-3/+3
| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Too painful to readJacob Vosmaer2016-02-251-1/+1
| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Update gitlab_gitJacob Vosmaer2016-02-251-1/+1
| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into lazy-diffsJacob Vosmaer2016-02-25524-5657/+30736
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | Merge branch 'feature/jschatz1/sidebar-sizing' into 'master' Jacob Schatz2016-02-245-68/+32
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sidebar overlaps content when screen is below 1200px. When screen is below 1200px, the sidebar overlaps. When screen is above 1200px, the sidebar pushes content out. z-index change to make sure hamburger stays on top. Fixes #12717 ![screensize](/uploads/9a21fa06d583a49d6ebbf1ada34c6792/screensize.gif) ![screensize-small](/uploads/7c25f46e962248a40840562a01c83f8f/screensize-small.gif) Also sorry I couldn't get the collapse button in the screen cap. It's there. See merge request !2620
| | * | | | | | | | | | | | | | | | | | Initialize navigation shortcuts on project's files pagefeature/jschatz1/sidebar-sizingAlfredo Sumaran2016-02-232-0/+2
| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | Fix failing specAlfredo Sumaran2016-02-231-1/+0
| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | Set window_size to 1366*768Alfredo Sumaran2016-02-232-2/+2
| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | Ability to toggle sidebar on smaller screensAlfredo Sumaran2016-02-233-20/+12
| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | Fixes padding when right sidebar is not presentAlfredo Sumaran2016-02-231-0/+11
| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | Update scrollbars after toggle sidebarAlfredo Sumaran2016-02-231-0/+6
| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | Sidebar overlaps content when screen is below 1200px.Jacob Schatz2016-02-163-67/+22
| | | |_|_|_|_|_|_|/ / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When screen is below 1200px, the sidebar overlaps. When screen is above 1200px, the sidebar pushes content out. z-index change to make sure hamburger stays on top. Fixes #12717
| * | | | | | | | | | | | | | | | | | Merge branch 'bugfix/jschatz/sidebar-issues/minimize-on-diff' into 'master' Jacob Schatz2016-02-242-2/+14
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Shrink on diff view * Shrinks when navigating to diff view. * Shrinks when refreshing on diff view. * Expandable at anytime. ![diff](/uploads/ec3ff1e7be7571a3af251e9ec9f704c1/diff.gif) See merge request !2735
| | * | | | | | | | | | | | | | | | | Wait until listeners are set before triggering a 'click' eventbugfix/jschatz/sidebar-issues/minimize-on-diffAlfredo Sumaran2016-02-241-3/+7
| | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | Remove unused methodsAlfredo Sumaran2016-02-241-16/+0
| | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | Move script inside of MergeRequestTabs classAlfredo Sumaran2016-02-242-12/+10
| | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | Merge branch 'master' into minimize-on-diffAlfredo Sumaran2016-02-24328-4090/+26555
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|/ / / / / / / / / / / | | | |/| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | Shrink on diff viewJacob Schatz2016-02-172-0/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Shrinks when navigating to diff view. Shrinks when refreshing on diff view. Expandable at anytime.
| * | | | | | | | | | | | | | | | | | Merge branch 'fix_git_tag_in_architecture' into 'master' Achilleas Pipinellis2016-02-241-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed ~git beeing displayed as link to issues tagged with git in architecture.md The architecture documentation explains `~git` from the picture below which is replaced by a [link to issues tagged with `git`](https://gitlab.com/gitlab-org/gitlab-ce/issues?label_name=git). I believe that this was unintended and should be fixed by using backticks. ![Screenshot_from_2016-02-13_21-36-30](/uploads/5ea1a60e8b230952874e58eab0abe1ac/Screenshot_from_2016-02-13_21-36-30.png) See merge request !2814
| | * | | | | | | | | | | | | | | | | | Fixed ~git beeing displayed as link to issues tagged with gitFinn Glöe2016-02-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | | | | | | | | | | | | | | | Merge branch 'commit-status-permission-update' into 'master' Achilleas Pipinellis2016-02-241-0/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update commit status permissions [ci skip] cc @axil See merge request !2942
| | * | | | | | | | | | | | | | | | | | Update commit status permissions [ci skip]commit-status-permission-updateKamil Trzcinski2016-02-231-0/+2
| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Merge branch 'feature/slack-notifications-on-ci' into 'master' James Lopez2016-02-242-0/+54
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | update ci configuration to send slack notifications on failure Updates CI config file and adds a task to send notifications when a build fails on master or on any tag. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/12805 See merge request !2681
| | * | | | | | | | | | | | | | | | | | | updated gitlab ci based on feedbackJames Lopez2016-02-241-2/+2
| | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | fix gitlab-ci.ymlJames Lopez2016-02-221-3/+3
| | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵James Lopez2016-02-22227-3633/+25421
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/slack-notifications-on-ci # Conflicts: # .gitlab-ci.yml
| | * | | | | | | | | | | | | | | | | | | resolve merge conflictJames Lopez2016-02-181-1/+9
| | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵James Lopez2016-02-18365-2260/+6005
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/slack-notifications-on-ci # Conflicts: # .gitlab-ci.yml