summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Fix assorted rspec failures due to stale, cached user permissionsStan Hu2016-08-201-21/+27
* Merge branch '581-ee-backport-branch-permissions' into 'master' Douwe Maan2016-08-202-14/+19
|\
| * Add element container to dropdowns581-ee-backport-branch-permissionsAlfredo Sumaran2016-08-191-6/+8
| * Use typeof instead of Underscore methodAlfredo Sumaran2016-08-191-2/+2
| * check if selectedObject is definedAlfredo Sumaran2016-08-191-1/+1
| * make input name to be a functionAlfredo Sumaran2016-08-191-8/+11
* | Merge branch 'disable-issue-by-email' into 'master' Robert Speicher2016-08-201-1/+4
|\ \
| * | Disable “issue by email” feature until it uses a different tokenDouwe Maan2016-08-191-1/+4
* | | Merge branch 'fix-diff-note-discussion-id' into 'master' Rubén Dávila Santos2016-08-201-0/+3
|\ \ \
| * | | Call `set_discussion_id` again in DiffNote `before_validation` because the or...Douwe Maan2016-08-191-0/+3
| |/ /
* | | Merge branch 'issue_18135' into 'master' Douwe Maan2016-08-196-16/+62
|\ \ \
| * | | Todos sorting dropdownissue_18135Felipe Artur2016-08-196-16/+62
* | | | Merge branch 'gokmengoksel/gitlab-ce-koding' into 'master' Stan Hu2016-08-1914-2/+149
|\ \ \ \
| * | | | Support integration with Koding (online IDE)Gokmen Goksel2016-08-1914-2/+149
* | | | | Merge branch 'lbennett/gitlab-ce-17465-search-for-project-with-cursor-keys' i...Jacob Schatz2016-08-192-35/+57
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | review changeslbennett/gitlab-ce-17465-search-for-project-with-cursor-keysLuke Bennett2016-08-192-12/+9
| * | | | Fixed conflictsLuke Bennett2016-08-182-16/+13
| * | | | Fixed specsLuke Bennett2016-08-181-2/+3
| * | | | Fixed spec and improved formattingLuke Bennett2016-08-182-3/+3
| * | | | Moved changes across to es5 and changed spec to es6Luke Bennett2016-08-184-1034/+55
| * | | | Fix failed testsLuke "Jared" Bennett2016-08-181-1/+1
| * | | | Further review changes and removed large ammounts of reformattingLuke "Jared" Bennett2016-08-182-107/+132
| * | | | Fixed test turbolink conditionLuke "Jared" Bennett2016-08-181-5/+5
| * | | | Review changes and final formattingLuke "Jared" Bennett2016-08-181-140/+115
| * | | | improved turbolinks.visit conditionalLuke "Jared" Bennett2016-08-181-1/+1
| * | | | Added new non-selectable selector exclusions to fix arrow key events, fixed t...Luke Bennett2016-08-182-0/+1006
* | | | | Merge branch 'mark-as-processable' into 'master' Robert Speicher2016-08-193-0/+9
|\ \ \ \ \
| * | | | | Fix rubocop offense in pipeline modelmark-as-processableGrzegorz Bizon2016-08-191-1/+1
| * | | | | Make all future skipped builds as processable when retrying a buildKamil Trzcinski2016-08-183-0/+9
* | | | | | Merge branch '21010-emailsonpushworker-incorrectly-claims-deleted-a-commit-af...Douwe Maan2016-08-191-2/+2
|\ \ \ \ \ \
| * | | | | | Fix force-push message in push emailsSean McGivern2016-08-191-2/+2
* | | | | | | Merge branch 'fix-discussions-on-changed-lines' into 'master' Robert Speicher2016-08-195-1/+14
|\ \ \ \ \ \ \
| * | | | | | | Fix bug where notes weren’t shown in discussion when the code had changed a...Douwe Maan2016-08-195-1/+14
* | | | | | | | Merge branch 'issue-boards-label-text-color' into 'master' Robert Speicher2016-08-192-1/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Added text color to issues labels in issue board listsPhil Hughes2016-08-192-1/+2
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'wall-clock-time-for-showing-pipeline' into 'master' Robert Speicher2016-08-199-35/+27
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | Merge remote-tracking branch 'upstream/master' into wall-clock-time-for-showi...Lin Jen-Shin2016-08-2038-63/+182
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into wall-clock-time-for-showi...Lin Jen-Shin2016-08-19205-620/+6187
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| * | | | | | | | Use travel_to instead of dependency injection, feedback:Lin Jen-Shin2016-08-192-3/+3
| * | | | | | | | Merge remote-tracking branch 'upstream/master' into wall-clock-time-for-showi...Lin Jen-Shin2016-08-1779-269/+944
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Introduce Gitlab::Utils.now so that it's easier to stubLin Jen-Shin2016-08-152-3/+3
| * | | | | | | | | Merge remote-tracking branch 'upstream/pipeline-hooks-without-slack' into wal...Lin Jen-Shin2016-08-1520-53/+114
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Rename to total_duration and we're not using CommitStatus.durationLin Jen-Shin2016-08-153-9/+3
| * | | | | | | | | | We could just sum with SQLLin Jen-Shin2016-08-151-1/+1
| * | | | | | | | | | Update duration for wall-clock timeLin Jen-Shin2016-08-151-1/+1
| * | | | | | | | | | Merge branch 'pipeline-hooks-without-slack' into wall-clock-time-for-showing-...Lin Jen-Shin2016-08-1571-535/+1029
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Cleanup the use of duration and optimize some queriesLin Jen-Shin2016-08-108-42/+31
| * | | | | | | | | | | Show wall-clock time when showing pipeline instead of:Lin Jen-Shin2016-08-094-4/+13
* | | | | | | | | | | | Merge branch 'issue-boards-mobile-improvements' into 'master' Jacob Schatz2016-08-197-38/+8
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | |
| * | | | | | | | | | | Removed commented code :poop:issue-boards-mobile-improvementsPhil Hughes2016-08-192-26/+0