summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'events-performance' into 'master' Robert Speicher2016-01-278-20/+14
|\
| * Use Atom update times of the first eventevents-performanceYorick Peterse2016-01-276-13/+5
| * Don't pluck project IDs for eventsYorick Peterse2016-01-265-10/+12
* | Merge branch 'rs-skip-2fa-on-signout' into 'master' Robert Speicher2016-01-271-0/+2
|\ \
| * | Skip the 2FA requirement during logoutrs-skip-2fa-on-signoutRobert Speicher2016-01-231-0/+2
* | | Merge branch 'diff-colors' into 'master' Robert Speicher2016-01-274-8/+8
|\ \ \
| * | | Increase contrast between highlighted code comments and inline diff marker.diff-colorsDouwe Maan2016-01-274-8/+8
* | | | Merge branch 'fix/unexistent-group-500' into 'master' Robert Speicher2016-01-271-0/+1
|\ \ \ \
| * \ \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/unexistent-...James Lopez2016-01-2714-57/+105
| |\ \ \ \ | | |/ / /
| * | | | update fix based on feedbackJames Lopez2016-01-271-2/+1
| * | | | fix for failing specJames Lopez2016-01-261-1/+2
| * | | | feature and fix for 500 on group missingJames Lopez2016-01-261-0/+1
| | |_|/ | |/| |
* | | | Merge branch 'rs-require-jquery-ui' into 'master' Dmitriy Zaporozhets2016-01-271-1/+4
|\ \ \ \
| * | | | Limit jquery-ui requires to what we actually users-require-jquery-uiRobert Speicher2016-01-251-1/+4
| |/ / /
* | | | Merge branch 'rs-2fa-requirement-wording' into 'master' Dmitriy Zaporozhets2016-01-271-2/+2
|\ \ \ \
| * | | | Update wording for 2FA requirement noticers-2fa-requirement-wordingRobert Speicher2016-01-231-2/+2
| | |_|/ | |/| |
* | | | Merge branch 'rs-issue-12672' into 'master' Dmitriy Zaporozhets2016-01-271-2/+1
|\ \ \ \ | |_|_|/ |/| | |
| * | | Remove link from system hookrs-issue-12672Robert Speicher2016-01-241-2/+1
* | | | Merge branch 'fix/commit-status-artifacts' into 'master' Kamil TrzciƄski2016-01-271-1/+1
|\ \ \ \
| * | | | Use generic method to checks if artifacts are availableGrzegorz Bizon2016-01-261-1/+1
| | |_|/ | |/| |
* | | | Update ExternalIssue regex for JIRA integrationBlake Hitchcock2016-01-261-1/+1
* | | | Merge branch 'bug/jschatz1/file-browser-lines' into 'master' Dmitriy Zaporozhets2016-01-263-3/+2
|\ \ \ \
| * | | | Adds margin top to readme holder so not flush.Jacob Schatz2016-01-261-0/+1
| * | | | adds border color to tables globally.Jacob Schatz2016-01-262-4/+1
| * | | | Fix border color.bug/jschatz1/file-browser-linesJacob Schatz2016-01-261-0/+1
| * | | | Revert "Styles for file list change."Jacob Schatz2016-01-264-36/+37
| * | | | Revert "Adjusts styles of table tree"Jacob Schatz2016-01-262-34/+10
| * | | | Adjusts styles of table treeJacob Schatz2016-01-262-10/+34
| * | | | Styles for file list change.Jacob Schatz2016-01-264-37/+36
* | | | | Merge branch 'search-box-in-group-members-view-is-too-small-for-placeholder-i...Dmitriy Zaporozhets2016-01-261-0/+10
|\ \ \ \ \
| * | | | | Placeholder now visible completely.search-box-in-group-members-view-is-too-small-for-placeholder-in-chromeJacob Schatz2016-01-251-0/+10
| | |/ / / | |/| | |
* | | | | Merge branch 'using-a-or-m-hotkeys-on-issuable-tab' into 'master' Dmitriy Zaporozhets2016-01-261-2/+2
|\ \ \ \ \
| * | | | | Clicks the edit button instead of opening the dropdownusing-a-or-m-hotkeys-on-issuable-tabJacob Schatz2016-01-251-2/+2
| |/ / / /
* | | | | Fix visibility level texts on application settingsZeger-Jan van de Weg2016-01-261-2/+2
* | | | | Merge branch 'save-button-color-application-settings' into 'master' Douwe Maan2016-01-263-4/+3
|\ \ \ \ \
| * | | | | Save button on app settings now btn-saveZeger-Jan van de Weg2016-01-263-4/+3
| |/ / / /
* | | | | Merge branch 'track-project-import-failure' into 'master' Douwe Maan2016-01-262-39/+74
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Move Gitlab::BitbucketImport::KeyDeleter to it's own importerDouglas Barbosa Alexandre2016-01-261-4/+0
| * | | | Extract Projects::ImportService service from RepositoryImportWorkerDouglas Barbosa Alexandre2016-01-252-39/+78
* | | | | Merge branch 'rs-issue-12677' into 'master' Douwe Maan2016-01-261-1/+5
|\ \ \ \ \
| * | | | | Update text_color_for_bg helper to support RGB triplet color codesrs-issue-12677Robert Speicher2016-01-241-1/+5
| | |_|/ / | |/| | |
* | | | | Merge branch 'rs-groups-index' into 'master' Douwe Maan2016-01-261-4/+5
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Make the `/groups` route behave as expectedrs-groups-indexRobert Speicher2016-01-231-4/+5
| | |_|/ | |/| |
* | | | Merge branch 'fix-import-redirect-loop' into 'master' Robert Speicher2016-01-261-5/+15
|\ \ \ \ | |_|_|/ |/| | |
| * | | Fixi import redirect loopDouglas Barbosa Alexandre2016-01-251-5/+15
* | | | Merge branch 'note-highlighting' into 'master' Robert Speicher2016-01-2516-64/+34
|\ \ \ \
| * | | | Highlight note code and edit previewnote-highlightingDouwe Maan2016-01-2516-64/+34
* | | | | Merge branch 'prioritize-previewable-over-plain-readmes' into 'master' Robert Speicher2016-01-251-4/+12
|\ \ \ \ \
| * | | | | Prioritize previewable over plain README filesprioritize-previewable-over-plain-readmesDouglas Barbosa Alexandre2016-01-251-4/+12
| |/ / / /
* | | | | Substituted deprecated forum link with project issues link. [ci skip]Jose Torres2016-01-251-3/+3
| |/ / / |/| | |