1. 26 Aug, 2016 5 commits
  2. 25 Aug, 2016 2 commits
  3. 24 Aug, 2016 6 commits
    • Douwe Maan's avatar
      Merge branch 'fix-github-doc-page' into 'master' · 82fb4ac0
      Douwe Maan authored
      Remove deprecated note from GitHub importer documentation
      
      ### Related issues
      
      https://gitlab.com/gitlab-org/gitlab-ee/issues/904
      
      See merge request !685
      82fb4ac0
    • Douwe Maan's avatar
      Merge branch 'fix-owner-remove-pages-message' into 'master' · a83ddb1b
      Douwe Maan authored
      Only show the message if user is not the owner
      
      Closes #323
      
      See merge request !628
      a83ddb1b
    • Stan Hu's avatar
      Merge branch 'stable-to-master' into 'master' · 13ae0aaf
      Stan Hu authored
      8-11-stable-ee to master
      
      
      
      See merge request !686
      13ae0aaf
    • Ruben Davila's avatar
      Remove duplicated method. · 8ab9af7f
      Ruben Davila authored
      8ab9af7f
    • Douglas Barbosa Alexandre's avatar
    • Ruben Davila's avatar
      Merge branch '8-11-stable-ee' into stable-to-master · 5a1a1e67
      Ruben Davila authored
       Conflicts:
      	app/assets/javascripts/application.js
      	app/assets/javascripts/boards/boards_bundle.js.es6
      	app/assets/javascripts/boards/components/board.js.es6
      	app/assets/javascripts/boards/components/board_list.js.es6
      	app/assets/javascripts/boards/mixins/sortable_default_options.js.es6
      	app/assets/javascripts/boards/models/label.js.es6
      	app/assets/javascripts/labels_select.js
      	app/assets/javascripts/protected_branch_access_dropdown.js.es6
      	app/assets/stylesheets/pages/boards.scss
      	app/assets/stylesheets/pages/builds.scss
      	app/assets/stylesheets/pages/pipelines.scss
      	app/controllers/projects/boards/issues_controller.rb
      	app/controllers/projects/merge_requests_controller.rb
      	app/helpers/blob_helper.rb
      	app/helpers/ci_status_helper.rb
      	app/models/ci/pipeline.rb
      	app/models/diff_note.rb
      	app/models/note.rb
      	app/models/project.rb
      	app/views/discussions/_diff_with_notes.html.haml
      	app/views/projects/boards/components/_board.html.haml
      	app/views/projects/boards/components/_card.html.haml
      	app/views/projects/ci/pipelines/_pipeline.html.haml
      	app/views/projects/merge_requests/widget/_open.html.haml
      	app/views/projects/notes/_hints.html.haml
      	app/views/projects/protected_branches/_create_protected_branch.html.haml
      	app/views/shared/issuable/_filter.html.haml
      	app/views/shared/issuable/_form.html.haml
      	app/views/shared/issuable/_label_page_default.html.haml
      	config/application.rb
      	db/schema.rb
      	doc/user/project/protected_branches.md
      	features/steps/project/merge_requests.rb
      	spec/controllers/autocomplete_controller_spec.rb
      	spec/controllers/projects/discussions_controller_spec.rb
      	spec/features/boards/boards_spec.rb
      	spec/features/protected_branches/access_control_ee_spec.rb
      	spec/features/protected_branches_spec.rb
      	spec/fixtures/api/schemas/issue.json
      	spec/lib/ee/gitlab/ldap/sync/group_spec.rb
      	spec/workers/elastic_indexer_worker_spec.rb
      5a1a1e67
  4. 23 Aug, 2016 25 commits
  5. 22 Aug, 2016 2 commits