summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Update pipeline detail view to accommodate post-merge pipelinesShinya Maeda2019-03-194-12/+65
* Merge branch 'revert-b24c0c8d' into 'master'Lin Jen-Shin2019-03-191-9/+2
|\
| * Revert "Merge branch..."Rémy Coutable2019-03-191-9/+2
* | Merge branch 'feature/users-search-results' into 'master'Sean McGivern2019-03-198-3/+53
|\ \
| * | add feature flag for users searchAlexis Reigel2019-03-144-2/+12
| * | use project_search_tabs? for user search checkAlexis Reigel2019-03-143-2/+11
| * | search results: show user's status emojiAlexis Reigel2019-03-142-1/+8
| * | add users search results to group scoped searchAlexis Reigel2019-03-141-0/+6
| * | dry up the use of the user search tabAlexis Reigel2019-03-141-12/+10
| * | move ability check from service class to viewAlexis Reigel2019-03-141-5/+6
| * | add users search results to project scoped searchAlexis Reigel2019-03-142-1/+7
| * | add users search results to global searchAlexis Reigel2019-03-143-1/+14
* | | Merge branch 'remove-diff-tree-filtering-flag' into 'master'Filipa Lacerda2019-03-192-35/+18
|\ \ \
| * | | Remove diff tree filtering feature flagPhil Hughes2019-03-182-35/+18
* | | | Merge branch 'make-tokens-encryption-optional-for-now' into 'master'Grzegorz Bizon2019-03-194-4/+4
|\ \ \ \ | |_|_|/ |/| | |
| * | | Make runners token encryption to be optionalKamil Trzciński2019-03-184-4/+4
* | | | Update TokenAuthenticatable so methods can be overriddenLin Jen-Shin2019-03-192-8/+19
* | | | Introduce ApplicationSettingImplementation yayLin Jen-Shin2019-03-192-276/+283
* | | | Fix undefined variable error on json project viewsAlejandro Rodríguez2019-03-183-6/+6
* | | | Merge branch '10428-cluster-sidebar' into 'master'Phil Hughes2019-03-181-0/+2
|\ \ \ \
| * | | | Removes EE differences for clusters/_sidebar.html.hamlFilipa Lacerda2019-03-181-0/+2
| | |/ / | |/| |
* | | | Resolve "Spinners are active prematurely in Bitbucket Cloud import"Brandon Labuschagne2019-03-181-0/+12
* | | | Fix skipping of user rendering for none and anyIgor2019-03-181-2/+2
* | | | Merge branch '58999-z-index-issue-on-pipeline-dropdown' into 'master'Phil Hughes2019-03-181-1/+1
|\ \ \ \
| * | | | Fix z-index issueNathan Friend2019-03-181-1/+1
| |/ / /
* | | | Merge branch 'ce-10421-implement-the-retrieval-reading-of-the-insights-file-t...Lin Jen-Shin2019-03-181-2/+9
|\ \ \ \ | |_|/ / |/| | |
| * | | New Repository#insights_config methodRémy Coutable2019-03-181-2/+9
* | | | Merge branch '6353-pipelines-index' into 'master'Phil Hughes2019-03-181-0/+2
|\ \ \ \ | |_|/ / |/| | |
| * | | Removes EE differences for pipelines/index.htmlFilipa Lacerda2019-03-151-0/+2
* | | | Merge branch 'sh-fix-issue-59065' into 'master'Rémy Coutable2019-03-181-1/+1
|\ \ \ \
| * | | | Fix Error 500 when user commits Wiki page with no commit messageStan Hu2019-03-161-1/+1
* | | | | Merge branch '43297-authorized-application-count' into 'master'Douwe Maan2019-03-181-1/+1
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Fix Authorized applications count.moyuru2019-03-121-1/+1
| * | | | Fix authorized applications countmoyuru2019-03-021-1/+1
* | | | | Merge branch 'remove-unused-css-from-mr-24724' into 'master'Phil Hughes2019-03-181-6/+0
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Remove unused CSS (similar to BS4's .align-items-center)Takuya Noguchi2019-03-141-6/+0
* | | | | Externalize strings from `/app/views/projects/pipelines`George Tsiolis2019-03-155-25/+27
* | | | | Merge branch '58933-broken-ui-on-commits-on-mobile' into 'master'Annabel Dunstone Gray2019-03-151-6/+3
|\ \ \ \ \
| * | | | | Fix UI layout on Commits on mobileTakuya Noguchi2019-03-141-6/+3
| |/ / / /
* | | | | Merge branch 'sh-handle-null-bytes-in-merge-request-diffs' into 'master'Nick Thomas2019-03-151-1/+6
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Fix error creating a merge request when diff includes a null byteStan Hu2019-03-141-1/+6
| |/ / /
* | | | Merge branch 'refactor-boards-actions' into 'master'Douwe Maan2019-03-154-89/+41
|\ \ \ \
| * | | | Remove NUMBER_OF_PERMITTED_BOARDS from ProjectHeinrich Lee Yu2019-03-131-13/+1
| * | | | Remove redirecting to last visited boardHeinrich Lee Yu2019-03-131-16/+0
| * | | | Refactor groups and projects boards actionsHeinrich Lee Yu2019-03-133-76/+56
* | | | | Merge branch 'ce-6098-extract-ee-specific-files-lines-for-app-views-admin-app...Lin Jen-Shin2019-03-156-53/+59
|\ \ \ \ \
| * | | | | Move EE specific code in admin application settingsMartin Wortschack2019-03-146-53/+59
* | | | | | Merge branch '57330-fix-comment-edited' into 'master'Sean McGivern2019-03-151-0/+8
|\ \ \ \ \ \
| * | | | | | Hide "Edited" when note is transformed or resolvedHeinrich Lee Yu2019-03-141-0/+8
| | |_|/ / / | |/| | | |
* | | | | | Merge branch '56970-fix-mr-stuck-loading-on-error' into 'master'Phil Hughes2019-03-152-5/+9
|\ \ \ \ \ \
View Lorry Controller Status